Mostly text changes and a little reordering