progress display error fixed
merge code
fix progress display