General cleanup, makefile changes, etc