Fixed some things for 1.5 and corrected the pep8 issues.