Reorganized the sequence of sections a bit.