fix and improve verbosity