more fixes, things seems to works nowso