Fixing/Adding in missing Events into the XAML

Cleaning up some of the todo comments I left myself...