CONTRIB-4312 'display description on course page' + general code tidy up