Minor tweaks, ready to fix intiial scope error with CourseProvider object