most of edits for #50, chapter <= 2