wip
more tweaks