some more tweaks