Fixed watching and other stuff