Readme and minor CLI tweaks