Solved some bugs in server and datahelper