Event Registry & Cleanup (No version change)

Added the event registry, and did some comment clean-up and addition.