Formatting, clarity, and a few FIXME notes.