A bunch of tweaks