Add a few events, improve logging.