bug fixes with messages sending and display