better handling of improved messages (so much cleanup last time)