added report and changed tokenization