Fixed several outstanding issues with the courses and main courseware application.