fix #275 #237; implements watchers for mouse x and mouse y

Tested with all sorts of watchers and it doesn't break anything! :)