Made a few changes to messaging