Added verbosity settings. Some cleanup