tweak before changing the token representation
try to adapt for the record
add annotations
tweak
make tokens with location except quot and antiquot