Fix a couple typos
Add/Merge files from Stephen Bennett and Tweak