wip more fixes