Made the -tokens flag to produce exactly the same output as the executable