Improve watch: relative paths, better errors