Merged latest updates from the main book.