Fixing typos and minor changes