minor changes to commandline functionality