Added three new exceptions and four new edits