Rename internal variables
Some documentation on new events
Update TODOs