Improvements to client libraries
Some improvements on server