don't call it 'templating' as per Rafael's request
fix several template typos
fix context for template element
small markup tweak
template content parenting