(a) fixed some bad references in the comments of the exceptions.
(a) merge