- fixed : revised faults and some bugs o_O