Fixed typos and some updates