improve some msgs