more and more tweaks