2nd edition, fix the issues#4 #5 and #7

2nd edition, fix the issues #4 #5 and #7