fix some erros