Change server and fix some bugs