Minor PEP8 fixes.
More debugging stuff