Done some minor errors correction