more fixes and wip