Hopefully completed EventHandler
Fixed Typos in ToDo