some fix and update