fix some logics
add progress bar logic
update json