Lots of tweaks