lots more tweaks