even more tweaks