externally loaded templates, even more cleanup, fixed many api calls to work with new system