updated Makefile and clean-ups