updated scenarios, added verbosity option, bug fixes
added another scenario