fixed progress numbers I hope
Merge branch 'chris'