First edit of slides.
Corrections.
Merge conflicts.