Typos and a few other improvements