some c++ edits.  Nothing major - just reorg