more fixes, does not run yet :(