improved Error handling and progress, some name refactoring