Books integration and bug fixes
Minor bug fixes