chapter reordering, editing and typo corrections