Added line number count and Token info