line number fixes in getTokens