Fix client/server interaction; better payload