fixing messaging bugs. coming together!