Improvements for handling multiple events. Updated puppet contact code.