Reverted accidental changes to Makefile and Loader.js
Some fixes to image loading