makefile
pep8
minor stuff