fixed stuff, works on python 2.7 now