some more fixes
finally solved most issues