some issues fixed and testing with the server part