wip fixes