Wait randomly

- Also improvements in messages