modify some points
Merge branch 'ph7_dev2' into ph7_review