Added location + 1st rounds of syllabus changes
2nd round of edits