keep commas inside token text in token parse, tweak features
add tags, append manually tagged addrs to output file