Progress Indicator and bug fixes