Finish client and some fix server