improvements in client - server sync