More work on torrent module.