Fixed imports for new gi bindings.
Fixed Typo and various PEP8 things.