add new functions and page templates
rename a couple