20141008, fix some issues.