Add progress indicators and broken error handling