minor updates + watchposition