wip: fixups