Add watch command
Improve error handling