Lots of small changes that I can't be fucked cked to commit separately.