various templating bug fixes
updated endpoints and bug fixes