Add numberEvents, make hilighting obey settings.