Fixed a few typos and some left over merge cruft