Partially fixed Windows linking issue
Improvements to Makefile; more progress on linking
Merge.