more fixes nooo