various fixes
fix
Merge pull request #9 from sandersonet/fix-watch

Various Fixes