More improvements in progress bar code + cleaneup.