This is a whole bunch of stuff :/

That I really should have been doing on individual branches.
I am sufficiently ashamed.
fixing stupid conflict