More cleanup, reordered some slides.