Better messages (8/20)

Better messages