add message updating
Make reply handling more reliable
Merge branch 'development' into livetest