Added remaining callback events. Cleanup.