post CMP commit

flashlight, and other small changes.