more wip on bugfixes