Fix some commenting. Fix central error handing of messages. Still work to do.