more fixes added