made some more tweaks