[132] refactoring server core part2;client small fix;