Lots of cleanup. And more new templates.