New server model, minor client updates