Improve error handling and clean up updates/watchers views