Lots of tweaks everywhere