Better messages (15/20)

Better messages