Courses updated

Code clean up and todo stuff