Updated help and command line mode