Adding more expo andf fix some typos