Cleaned up Makefile, streamlined deps and re-enabled commonmod