more fixes needed