fix verbose mode syntax and cleanup