fix progress and remove useless commented code
add numbered listing
Merge remote-tracking branch 'refs/remotes/origin/master'