* fixed broken super call
+ added some TODOs