Fixed some things about command line behaviour.