Updates saver watches - listen to tokenAdded and tokenRemoved too

Fixes #351