Last minor fixes, removing comments, adding a few speaker-notes