Fix broken links.
Code cleanup.
Work on Hamcrest slides.