Rearrange some sections and clarify some instructions.