Added and changed courses, slight fixes