fixed some erros