remove some bugs (There remains bugs yet)