some fix
some changes