finished template management + improvements & comments