Further updates to the error reporting system. Design finalized; Needs testing