bunch o' tweaks