Added more verbosity levels
Removed unused options
Fix handling of --verbose=... and BC break
Fixed tests