[fix] correct top class for super
[mod] update TODO