Fixed many pep8 warnings.
Follow up.
Fixed bug.
Hopefully last turn around.