cleanup
Works again, now passes template path down.
Update templates
update doc templates