Improve messages
Add timer