Lots more tweaks