Updates

Combine server and client
Error recovery