Improvements to Makefile; more progress on linking