Fix typos
Fixes and minor tweaks