Memoize events
Remove old comments
Update TODO