update core and template loader stuff
update core and template loader stuff