Fairly large clean-up. Main change is passing a URL to download methods
instead of a connection.