[wip] fixes