final client + server improvements