Fix typos and minor changes