Several typos

Please see commit log for details.