better error management for downloading and some small enhancements