Added several events. Cleanup.