Fixed template issue; Added notes field.