reconfigure some cirriculum and make some template fields optional