work on locations in courses
fix merge issues