More small changes to command line usage