Fix for two 'no's on RSVP
Adding better counts throughout