Better messages (10/20)

Better messages