Book updates and bug fixes