CQM-89 Improvements based on testing

* skip mode for commands
* better messages
* fix formatting issues