add token numbers to needInfo output

+ remove some trailing spaces as a bonus.