history cleanup

Here's a cleaner version of the early history of this branch, finished up from where I left off last time.

This shouldn't really change anything, apart from reconciling some details with master... But I still need to do a full test-run to see if I broke something by accident.