Updated names and classes, added special event scheduling functionality.

Did some stuff, let me know if you think anything is wrong or confusing.