Small gix
fixed chat messaging
merge change