A little cleanup, also a second draft of slides