upgrade RSVP

series of smaller fixes and improvements.