Fixed mistakes/outdated stuff in template syntax