progressbar is a little more smooth
Merge branch 'prog' into dev