some fix and change