added new tokens
showing original input on exception
added sorted_tokens method