Major improvements to books and general formatting