Cleans up some comments.
Removes finished TODO
Adds missing super
Adds some more comments