more rearranging
run-through edits