Refactored feature sets by adding superclass. Also, fix stat keeping. No warnings\!