Fix feedback provided by @nmonkee
Fix more feedback provided by @nmonkee: CMD vs COMMAND