updated Makefile, fixed git issues