Bug and Typos Fixed, Oh My

Cleared out the CoC bug report forum.
More Assorted Bug Fixes
Fixes #216
Merge remote-tracking branch 'upstream/master'