Less errors and better progress indicator