Bunch o tweaks