new exceptions and 2 edits