c39bbd1
fixed bugs: 577101, 677548; improved consistency across the whole book, retaged some elements