removed some msgs + typo