fixes and replies to Feng's comments