fixes and verbosity