Lots of updates to comments, activities, and the tokenizer.