minor updates + watchposition
Merge pull request #1 from adenes/master

minor updates + watchposition