First set of tweaks. Modified Makefile to use automatic rules.