So many patches

It's a lot already, and there's a few more to do, but nearly there. Hoorah!