fixer some bugs