Rework (some more)
More rewriting
More rewriting...
Ch 46
Ch 48 : improved
Final patches