Makefile a lot better; still plan on adding ant build file later