some more tweaks, wip