Fix endCourse and add name/room