fix
some progress