Made the code mostly PEP-8 compliant, mostly. Plus bux fixes!