Updates to features, chapter titles, chapter outlines
Merged upstream history changes