Fixed typos
Some final changes