Template updates

nice, this was sorely needed!