added line numbers to tokens for helpful erroring