better version of evaluator
fix baseline script
Merge remote-tracking branch 'upstream/master'
Tokenized.