update with new courses, fixed some bugs caused by transition to mdd as RSTO.