rework a bunch of wording, move some sections around