add some fix and new module