Progress Bar Fixes

Improvements to prior commit, didn't realize I was supposed to set the
progress maximum a tad higher.