fix
many other fixes