added two more templates and number and label format stuff