- more fixes for commands