Better messages (11/20)

Better messages