bit more tweaks