various edits and order changes