lunch payments, Event Aggregator, minor improvements