Chapter 16 and an ebook update