more fixes,