Move actual references to its own class
Implement MessageEvent
Minor change
Some docs