some fixes
include course name in title