Improving error handling
Preparing for torrent automation