Repair merge snafu.
Typos/pastos cleanup