Verbosity refactors. Bugfixes.