messages bugs fixed