welcome and goodbye templates, fixes for template parsing