Adding Chat and Command events
Cleaning up some comments