PEP8 Changes, minor/obvious bugfixes.