update Makefile, pep8, scaling