wip: bugfixes