Tidy up commands, and make them output when things go boom