Remove some TODOs
Remove even more TODOs
Correct some TODOs
Use better data structures in EventActionRegister