[wip] tweaks