Remove tokens in batch mode

because they can lead to follow up changes.
Don't redraw the tree on tokenAdded

... led to an ugly screen flickering.
Fix undoing of tokenRemoved