tweak verbosity
Updated for new features