More work with the Token tree, input streams