makefile and some cleanup.