Some reworking (includes: fix for url is already an archive url, timeouts)