Some mistakes fixed