three new exceptions and four new edits
Merge pull request #251 from andy2013march/master

Added three new exceptions and four new edits