Customise verbosity of --debug, and some maintenance fixes