incorporate more of Wei's comments into the doc