Some edits of the last post + Ch. 15/16