added more tweaks