Fixed typos and some minor issues