improve messages