Fix bads in help and tidy up