Design and minor changes to events registering.