Added some annotations for the hand-in version, as well as some TODO
points for playing with after exams