Small verbosity bugs and some cleanup