Topic/lots o little things

why pull out into different branches when you'd just have to cherry-pick them back? madness!

These should be pretty uncontroversial.