Fixed typos and other issues