Smooth out some bugs
Change the message behavior a bit