fix multi message bug and some style issue