Finally decided to come back and put some more time into lowering this. Still some silly time losses, especially the one in Chapter 4!

I don't think I'll wait 3 years to run this one again :)