[wip] some more fixes