adding some more fixes