Lots and Lots of tweaks