A bunch of improvements and fixes to book #873

Closed zeenix closed 1 week ago