more tweaks, moving around