some more fixes..