made more tweaks