some fix
things