Typos and some minor fixes