Corrected some erros