Tweaks all around