C++ MWC1 and various small changes.
C++ MWC1 code, and other small changes.