Typos and fixes