fixes for commands