Slight tweaks, and chapterifying