rearrange and improve messages a little