Updated Makefile and loader