more fixes!!!