update message coordinator, fixed unique component constraints, cleanup