minor improvements and removed onProgress