more tweaks etc