Fixed typos and some other final changes