ability to override Verify class
Review fixes.