added command line stuff again