Better messages (13/20)

Better messages