better timeout fcn
Merge branch 'message_status' into testing