fixing messaging bugs