More changes to client, upload/download threads created