fix update incident
refactor
refactor cli and wrapper