a bunch of fixes with the Event module, converted conceessionGen to use new Event module.