Cleanup and more outlines for lessons 4-6