Improve watching of individual files

Closes #9
Closes #105