more work on c++ generation