Fixed some messaging bugs, display issues.
Fixed merge issues after messaging bug fixes.