more fixes..