I did some things for message and user update logic.
Merge branch 'rfrost'