fix elapse time issue, message persistance issue