Removed Makefile from tracking and corrected some types