cleanup and fix makefile