Fix progress output, and minor mods.