still yet even more fixes