Server tidy.  RSVP conversion, handle various promises better
Minor client tidy