wip - more fixes