Added events module, and removed some comments