Tweak command line options and update readme