expanded accounting-event coverage, rewrote cycle timing