Fixing a lot of small issues related to diagnostic plotting and other…

[Ashar25]

… stuff to ensure correctness of xarray changes. Streamlining of input parameters, removal of some options that were rarely/never used.