small improvements in events and metrics