Small refactoring, progress bar removed
Added speed measuring. Improved error handling