Mostly course controller and some other bug fixes.