stage commit, working on evaluate
add missing commits...
add ui
resolve renkou.pro
resolve confict