Messaging further corrections and multiple instance handling

Messaging further corrections and multiple instance handling