Add verbose mode.  Cleanup