Exchange:  added supplier to model, defaulted to event forms; couple other bugs.