small fixes, still wip