Some fixes.
More fixes to code & slides.