Minor Demo updates, unwatch methods tested