Pep8, add missing imports, misc fixes

Merged Vitor Lopes requested to merge (removed):master into master

I have fixed a few things.

Merge request reports