Bug fix, logic update, build up wcf service