add more servers and fix some bugs