Whole bunch of tweaks