ok some more fixes