Big bits first, I'll redo the smaller bits tomorrow after some sleep.
Same as last time, rediffed against pre5