Minor behaviour and styling fixes for the commandline.