More editing.
Some more editing: fit everything in 16 pages. Yay!