updates: fix event matching, implement calibration, cleanups