Bunch o' really small tweaks