Added progress indicators for all steps
Fixed bugs with progress indicators
Refactored, made code easier to read