Fix and add new command