Added Makefile, fixing compiler errors
More compiler error fixes