fixes and more verbosity