2.6

bug fixes to template