making some more fixes