Some mistakes were resolved