add some more CR comments