few more tweaks