tidy up and make verbose output a little more helpful