Added some compatiblity with PEP8. Also fixed a huge bug...