fix an isuses (an make more bug)
more fix and more bug