20130624 Add more notes and fix some bugs.