Further token cleanup, verbose text everywhere.
Text field is now accurate for all tokens, (excluding exact whitespace)
Some token sources changed for more accurate text.