rearranged, more consistent templates, tag fix