Complete class-02 & some fixes