Update progressbar, merge some cm11