checking in some more fixes