fix comment, implement more gui, fix some bugs
Merge remote-tracking branch 'origin/master'