some more fixes

saeems to be owrking