makefile, and misc. cleanup