cleaned things up a bit and fixed Makefile