Better messages (9/20)

Better messages