Command line - fixin bugs