more updates to units, and make progress bar ok