Add verbose option

There are changes in here to fix linting issues with flake8. The relevant commit is 67109ef.