Various tweaks

Mostly to argument options and plotting