adding more fixes