more fixes for commands