Added some client/server improvements.