Refractored Progress and fixed bugs