Minor fixes

Combined some tasks, fixed criteria numbering, changed duplicate criteria