Simplified Makefile build settings
Significantly simplified build rules in Makefile
Minor corrections