cleanup
added templates
re-added users