new command + fixes