Package updates and some merges from the main book.