More fixes, still wip