wip: more bugfixes