CountEvents and updates to other classes to more closely match Chambers + Jurafsky 2008, 2009