Cleaned up two bugs, and added a verbosity flags.