Fix Makefile, and some pep8 and other small stuff