reword/reorder some things