A variety of minor updates.
CX_Events removal reverted because of the bug that resulted.