Tweaks, tweaks, and more tweaks