Improvements mostly related to client-server usage

Let's make those fields private.