diff --git a/src/command_download.cc b/src/command_download.cc
index 93a916a3..8fb05c13 100644
--- a/src/command_download.cc
+++ b/src/command_download.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -797,7 +797,7 @@ initialize_command_download() {
 
   CMD2_DL         ("d.wanted_chunks",    CMD2_ON_DATA(wanted_chunks));
 
-  CMD2_DL_V       ("d.tracker_announce",     std::bind(&torrent::TrackerList::manual_request, CMD2_BIND_TL, false)); 
+  CMD2_DL_V       ("d.tracker_announce",     std::bind(&torrent::Download::manual_request, CMD2_BIND_DL, false)); 
   CMD2_DL         ("d.tracker_numwant",      std::bind(&torrent::TrackerList::numwant, CMD2_BIND_TL));
   CMD2_DL_VALUE_V ("d.tracker_numwant.set",  std::bind(&torrent::TrackerList::set_numwant, CMD2_BIND_TL, std::placeholders::_2));
   CMD2_DL         ("d.tracker_focus",        std::bind(&torrent::TrackerList::focus_index, CMD2_BIND_TL));
diff --git a/src/command_dynamic.cc b/src/command_dynamic.cc
index ba4a4a8f..db059251 100644
--- a/src/command_dynamic.cc
+++ b/src/command_dynamic.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_events.cc b/src/command_events.cc
index 8deda496..7a9bb00c 100644
--- a/src/command_events.cc
+++ b/src/command_events.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_file.cc b/src/command_file.cc
index f9c54417..9852ad20 100644
--- a/src/command_file.cc
+++ b/src/command_file.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_groups.cc b/src/command_groups.cc
index 8f753e51..6440564a 100644
--- a/src/command_groups.cc
+++ b/src/command_groups.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_helpers.cc b/src/command_helpers.cc
index 0e836790..8a716757 100644
--- a/src/command_helpers.cc
+++ b/src/command_helpers.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_helpers.h b/src/command_helpers.h
index e85c8348..59053ebe 100644
--- a/src/command_helpers.h
+++ b/src/command_helpers.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_local.cc b/src/command_local.cc
index 15748a01..221db04e 100644
--- a/src/command_local.cc
+++ b/src/command_local.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_network.cc b/src/command_network.cc
index a30087a7..9300cc8a 100644
--- a/src/command_network.cc
+++ b/src/command_network.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_peer.cc b/src/command_peer.cc
index d497ae56..0cf103b5 100644
--- a/src/command_peer.cc
+++ b/src/command_peer.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_scheduler.cc b/src/command_scheduler.cc
index 9e9f798f..a2c92684 100644
--- a/src/command_scheduler.cc
+++ b/src/command_scheduler.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_throttle.cc b/src/command_throttle.cc
index bfca2758..f2e89e1e 100644
--- a/src/command_throttle.cc
+++ b/src/command_throttle.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_tracker.cc b/src/command_tracker.cc
index 0987fd12..65b0edb6 100644
--- a/src/command_tracker.cc
+++ b/src/command_tracker.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/command_ui.cc b/src/command_ui.cc
index a5975d66..7884959e 100644
--- a/src/command_ui.cc
+++ b/src/command_ui.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/control.cc b/src/control.cc
index ab9b3a4e..acf51e9e 100644
--- a/src/control.cc
+++ b/src/control.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/control.h b/src/control.h
index 3dc65ec2..29f3bcbd 100644
--- a/src/control.h
+++ b/src/control.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/curl_get.cc b/src/core/curl_get.cc
index 8fb4709d..fe1077ef 100644
--- a/src/core/curl_get.cc
+++ b/src/core/curl_get.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/curl_get.h b/src/core/curl_get.h
index 1d3a0d52..e66257ed 100644
--- a/src/core/curl_get.h
+++ b/src/core/curl_get.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/curl_stack.cc b/src/core/curl_stack.cc
index 318deb10..a801bdb8 100644
--- a/src/core/curl_stack.cc
+++ b/src/core/curl_stack.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/curl_stack.h b/src/core/curl_stack.h
index 53089bb2..9bd2f3aa 100644
--- a/src/core/curl_stack.h
+++ b/src/core/curl_stack.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/dht_manager.cc b/src/core/dht_manager.cc
index 8000d200..aaea8263 100644
--- a/src/core/dht_manager.cc
+++ b/src/core/dht_manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/dht_manager.h b/src/core/dht_manager.h
index 1d6b1b12..0576f18e 100644
--- a/src/core/dht_manager.h
+++ b/src/core/dht_manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download.cc b/src/core/download.cc
index eb1240f4..d8c051a8 100644
--- a/src/core/download.cc
+++ b/src/core/download.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download.h b/src/core/download.h
index a5b72bfd..6939e8d8 100644
--- a/src/core/download.h
+++ b/src/core/download.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index 28dc0956..f7c50cc5 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_factory.h b/src/core/download_factory.h
index 7bd7fc47..326cc701 100644
--- a/src/core/download_factory.h
+++ b/src/core/download_factory.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_list.cc b/src/core/download_list.cc
index cb47b8d3..939e6ff7 100644
--- a/src/core/download_list.cc
+++ b/src/core/download_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ DownloadList::close_quick(Download* download) {
   // handled by some parameter to the close function, or some other
   // way of giving the client more control of when STOPPED requests
   // are sent.
-  download->download()->tracker_list()->manual_cancel();
+  download->download()->manual_cancel();
 }
 
 void
@@ -635,7 +635,7 @@ DownloadList::confirm_finished(Download* download) {
 
   // Send the completed request before resuming so we don't reset the
   // up/downloaded baseline.
-  download->download()->tracker_list()->send_completed();
+  download->download()->send_completed();
 
   // Save the hash in case the finished event erases it.
   torrent::HashString infohash = download->info()->hash();
diff --git a/src/core/download_list.h b/src/core/download_list.h
index d4ffb921..25996e21 100644
--- a/src/core/download_list.h
+++ b/src/core/download_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_slot_map.h b/src/core/download_slot_map.h
index 29acdc27..2d996ef3 100644
--- a/src/core/download_slot_map.h
+++ b/src/core/download_slot_map.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_store.cc b/src/core/download_store.cc
index 1ce67e87..4364c1d4 100644
--- a/src/core/download_store.cc
+++ b/src/core/download_store.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/download_store.h b/src/core/download_store.h
index 94ab5a74..dd345c89 100644
--- a/src/core/download_store.h
+++ b/src/core/download_store.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/http_queue.cc b/src/core/http_queue.cc
index ca8326c5..9ab4be9b 100644
--- a/src/core/http_queue.cc
+++ b/src/core/http_queue.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/http_queue.h b/src/core/http_queue.h
index d36aaed4..ef0204b1 100644
--- a/src/core/http_queue.h
+++ b/src/core/http_queue.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/log.cc b/src/core/log.cc
index 43a32fec..432f69cb 100644
--- a/src/core/log.cc
+++ b/src/core/log.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/log.h b/src/core/log.h
index d679876b..372cdaae 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/manager.cc b/src/core/manager.cc
index 3c3e4639..b185758c 100644
--- a/src/core/manager.cc
+++ b/src/core/manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/manager.h b/src/core/manager.h
index 16902af3..610e8f99 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager.cc b/src/core/poll_manager.cc
index 458fef5d..85d7de79 100644
--- a/src/core/poll_manager.cc
+++ b/src/core/poll_manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager.h b/src/core/poll_manager.h
index 1649edf5..5b9e6507 100644
--- a/src/core/poll_manager.h
+++ b/src/core/poll_manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_epoll.cc b/src/core/poll_manager_epoll.cc
index 56b48456..8b7670db 100644
--- a/src/core/poll_manager_epoll.cc
+++ b/src/core/poll_manager_epoll.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_epoll.h b/src/core/poll_manager_epoll.h
index 3e4f2ac5..b000c640 100644
--- a/src/core/poll_manager_epoll.h
+++ b/src/core/poll_manager_epoll.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_kqueue.cc b/src/core/poll_manager_kqueue.cc
index bfbfa27c..5bf309e7 100644
--- a/src/core/poll_manager_kqueue.cc
+++ b/src/core/poll_manager_kqueue.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_kqueue.h b/src/core/poll_manager_kqueue.h
index 05165042..1c3bd0b9 100644
--- a/src/core/poll_manager_kqueue.h
+++ b/src/core/poll_manager_kqueue.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_select.cc b/src/core/poll_manager_select.cc
index 3710bc03..70d9fd1d 100644
--- a/src/core/poll_manager_select.cc
+++ b/src/core/poll_manager_select.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/poll_manager_select.h b/src/core/poll_manager_select.h
index e0d0e4fc..8aa46e43 100644
--- a/src/core/poll_manager_select.h
+++ b/src/core/poll_manager_select.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/view.cc b/src/core/view.cc
index bd365501..d028f126 100644
--- a/src/core/view.cc
+++ b/src/core/view.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/view.h b/src/core/view.h
index 23f8d2ad..a5e4f411 100644
--- a/src/core/view.h
+++ b/src/core/view.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/view_manager.cc b/src/core/view_manager.cc
index 24e2d8be..355d8809 100644
--- a/src/core/view_manager.cc
+++ b/src/core/view_manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/core/view_manager.h b/src/core/view_manager.h
index 11489a38..1f6c5da7 100644
--- a/src/core/view_manager.h
+++ b/src/core/view_manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/attributes.h b/src/display/attributes.h
index a4dcfa5a..54dc2e58 100644
--- a/src/display/attributes.h
+++ b/src/display/attributes.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/canvas.cc b/src/display/canvas.cc
index 970d060e..4394b894 100644
--- a/src/display/canvas.cc
+++ b/src/display/canvas.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/canvas.h b/src/display/canvas.h
index f4a4215e..4fe3e43e 100644
--- a/src/display/canvas.h
+++ b/src/display/canvas.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/frame.cc b/src/display/frame.cc
index 0e773095..6e09e35d 100644
--- a/src/display/frame.cc
+++ b/src/display/frame.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/frame.h b/src/display/frame.h
index 6802da08..a9758761 100644
--- a/src/display/frame.h
+++ b/src/display/frame.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/manager.cc b/src/display/manager.cc
index da9c89ef..4bf34aa9 100644
--- a/src/display/manager.cc
+++ b/src/display/manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/manager.h b/src/display/manager.h
index b027362b..37d05434 100644
--- a/src/display/manager.h
+++ b/src/display/manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element.h b/src/display/text_element.h
index bba449e2..6ab3fdf3 100644
--- a/src/display/text_element.h
+++ b/src/display/text_element.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_list.cc b/src/display/text_element_list.cc
index d3f18222..f769f6fd 100644
--- a/src/display/text_element_list.cc
+++ b/src/display/text_element_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_list.h b/src/display/text_element_list.h
index e839b400..29f7ce50 100644
--- a/src/display/text_element_list.h
+++ b/src/display/text_element_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_string.cc b/src/display/text_element_string.cc
index 5b1dd599..a4e45dc4 100644
--- a/src/display/text_element_string.cc
+++ b/src/display/text_element_string.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_string.h b/src/display/text_element_string.h
index 39e26302..38ecfb25 100644
--- a/src/display/text_element_string.h
+++ b/src/display/text_element_string.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_value.cc b/src/display/text_element_value.cc
index a3fb8e49..fe2d4674 100644
--- a/src/display/text_element_value.cc
+++ b/src/display/text_element_value.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/text_element_value.h b/src/display/text_element_value.h
index 416b5f18..c62be92f 100644
--- a/src/display/text_element_value.h
+++ b/src/display/text_element_value.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/utils.cc b/src/display/utils.cc
index c83fbd00..4597fbab 100644
--- a/src/display/utils.cc
+++ b/src/display/utils.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/utils.h b/src/display/utils.h
index 3d69021e..7f75425c 100644
--- a/src/display/utils.h
+++ b/src/display/utils.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window.cc b/src/display/window.cc
index 03d9d19d..af433f6f 100644
--- a/src/display/window.cc
+++ b/src/display/window.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window.h b/src/display/window.h
index 5e039a27..8e310aba 100644
--- a/src/display/window.h
+++ b/src/display/window.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_chunks_seen.cc b/src/display/window_download_chunks_seen.cc
index 15b37b5e..27fb0f79 100644
--- a/src/display/window_download_chunks_seen.cc
+++ b/src/display/window_download_chunks_seen.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_chunks_seen.h b/src/display/window_download_chunks_seen.h
index f0fb6dad..1300f79d 100644
--- a/src/display/window_download_chunks_seen.h
+++ b/src/display/window_download_chunks_seen.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_list.cc b/src/display/window_download_list.cc
index 71efec05..614b93d8 100644
--- a/src/display/window_download_list.cc
+++ b/src/display/window_download_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_list.h b/src/display/window_download_list.h
index 4ce5ea10..0fed0c18 100644
--- a/src/display/window_download_list.h
+++ b/src/display/window_download_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_statusbar.cc b/src/display/window_download_statusbar.cc
index c69bc01c..e2d61adb 100644
--- a/src/display/window_download_statusbar.cc
+++ b/src/display/window_download_statusbar.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@ WindowDownloadStatusbar::redraw() {
   position = print_download_status(buffer, last, m_download);
   m_canvas->print(0, 2, "[%c:%i] %s",
                   m_download->tracker_list()->has_active() ? 'C' : ' ',
-                  (int)(m_download->download()->tracker_list()->time_next_connection()),
+                  (int)(m_download->download()->time_next_connection()),
                   buffer);
 }
 
diff --git a/src/display/window_download_statusbar.h b/src/display/window_download_statusbar.h
index 10625b23..1476fc6a 100644
--- a/src/display/window_download_statusbar.h
+++ b/src/display/window_download_statusbar.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_transfer_list.cc b/src/display/window_download_transfer_list.cc
index 8e80f391..25a59d12 100644
--- a/src/display/window_download_transfer_list.cc
+++ b/src/display/window_download_transfer_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_download_transfer_list.h b/src/display/window_download_transfer_list.h
index 1f502558..a61c7009 100644
--- a/src/display/window_download_transfer_list.h
+++ b/src/display/window_download_transfer_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc
index be972763..6a923dc7 100644
--- a/src/display/window_file_list.cc
+++ b/src/display/window_file_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_file_list.h b/src/display/window_file_list.h
index 58021ced..43e27a50 100644
--- a/src/display/window_file_list.h
+++ b/src/display/window_file_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_http_queue.cc b/src/display/window_http_queue.cc
index f8c0675a..b6e3f509 100644
--- a/src/display/window_http_queue.cc
+++ b/src/display/window_http_queue.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_http_queue.h b/src/display/window_http_queue.h
index 131dbff8..25e93b48 100644
--- a/src/display/window_http_queue.h
+++ b/src/display/window_http_queue.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_input.cc b/src/display/window_input.cc
index e1290827..4d0d66d6 100644
--- a/src/display/window_input.cc
+++ b/src/display/window_input.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_input.h b/src/display/window_input.h
index c0257ef0..ed228e84 100644
--- a/src/display/window_input.h
+++ b/src/display/window_input.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_log.cc b/src/display/window_log.cc
index ec8bd661..03936833 100644
--- a/src/display/window_log.cc
+++ b/src/display/window_log.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_log.h b/src/display/window_log.h
index 8667dec2..35769800 100644
--- a/src/display/window_log.h
+++ b/src/display/window_log.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_log_complete.cc b/src/display/window_log_complete.cc
index 00cef03f..cf142d91 100644
--- a/src/display/window_log_complete.cc
+++ b/src/display/window_log_complete.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_log_complete.h b/src/display/window_log_complete.h
index 4ac7a77b..7b40a85f 100644
--- a/src/display/window_log_complete.h
+++ b/src/display/window_log_complete.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_peer_list.cc b/src/display/window_peer_list.cc
index 1271791d..db3fbba3 100644
--- a/src/display/window_peer_list.cc
+++ b/src/display/window_peer_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_peer_list.h b/src/display/window_peer_list.h
index ac15484d..484fe576 100644
--- a/src/display/window_peer_list.h
+++ b/src/display/window_peer_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_statusbar.cc b/src/display/window_statusbar.cc
index fee50347..9592a338 100644
--- a/src/display/window_statusbar.cc
+++ b/src/display/window_statusbar.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_statusbar.h b/src/display/window_statusbar.h
index dcd03770..b4df3126 100644
--- a/src/display/window_statusbar.h
+++ b/src/display/window_statusbar.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_string_list.cc b/src/display/window_string_list.cc
index 63b0a8bb..419434c2 100644
--- a/src/display/window_string_list.cc
+++ b/src/display/window_string_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_string_list.h b/src/display/window_string_list.h
index 4be40f62..e8ae81e7 100644
--- a/src/display/window_string_list.h
+++ b/src/display/window_string_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_text.cc b/src/display/window_text.cc
index 39ca9515..cf1ebcdd 100644
--- a/src/display/window_text.cc
+++ b/src/display/window_text.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_text.h b/src/display/window_text.h
index cadcc988..9035cc07 100644
--- a/src/display/window_text.h
+++ b/src/display/window_text.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_title.cc b/src/display/window_title.cc
index 300f6557..1df79adf 100644
--- a/src/display/window_title.cc
+++ b/src/display/window_title.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_title.h b/src/display/window_title.h
index ac5e1a47..f52d0e7d 100644
--- a/src/display/window_title.h
+++ b/src/display/window_title.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_tracker_list.cc b/src/display/window_tracker_list.cc
index 1903d677..e9debb75 100644
--- a/src/display/window_tracker_list.cc
+++ b/src/display/window_tracker_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/display/window_tracker_list.h b/src/display/window_tracker_list.h
index 226ff507..d54ab2a1 100644
--- a/src/display/window_tracker_list.h
+++ b/src/display/window_tracker_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/globals.cc b/src/globals.cc
index aa63b70f..b0cb293a 100644
--- a/src/globals.cc
+++ b/src/globals.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/globals.h b/src/globals.h
index 22c4b8f9..2faea757 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/bindings.cc b/src/input/bindings.cc
index c66dedf5..f02cb8f5 100644
--- a/src/input/bindings.cc
+++ b/src/input/bindings.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/bindings.h b/src/input/bindings.h
index 8b200dbd..e3f3a7a2 100644
--- a/src/input/bindings.h
+++ b/src/input/bindings.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/input_event.cc b/src/input/input_event.cc
index c9a2f118..7444560e 100644
--- a/src/input/input_event.cc
+++ b/src/input/input_event.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/input_event.h b/src/input/input_event.h
index 9db373bb..a6e946f7 100644
--- a/src/input/input_event.h
+++ b/src/input/input_event.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/manager.cc b/src/input/manager.cc
index 6614cff6..73637d1f 100644
--- a/src/input/manager.cc
+++ b/src/input/manager.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/manager.h b/src/input/manager.h
index b80ca552..fd5710a0 100644
--- a/src/input/manager.h
+++ b/src/input/manager.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/path_input.cc b/src/input/path_input.cc
index f20d2e72..d3ee45e5 100644
--- a/src/input/path_input.cc
+++ b/src/input/path_input.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/path_input.h b/src/input/path_input.h
index e7b8ca45..3564aca2 100644
--- a/src/input/path_input.h
+++ b/src/input/path_input.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/text_input.cc b/src/input/text_input.cc
index 7e19e86b..32c61bf8 100644
--- a/src/input/text_input.cc
+++ b/src/input/text_input.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/input/text_input.h b/src/input/text_input.h
index 5467ebe1..265ce7cd 100644
--- a/src/input/text_input.h
+++ b/src/input/text_input.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/main.cc b/src/main.cc
index 14ed43a7..ec19794a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/option_parser.cc b/src/option_parser.cc
index f5d324ff..b61541cc 100644
--- a/src/option_parser.cc
+++ b/src/option_parser.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/option_parser.h b/src/option_parser.h
index 7a00db10..82ae0e4d 100644
--- a/src/option_parser.h
+++ b/src/option_parser.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command.cc b/src/rpc/command.cc
index dd3310d7..1057071c 100644
--- a/src/rpc/command.cc
+++ b/src/rpc/command.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command.h b/src/rpc/command.h
index ba73bd12..bbb6ccdb 100644
--- a/src/rpc/command.h
+++ b/src/rpc/command.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_impl.h b/src/rpc/command_impl.h
index 0482693a..b7ec9168 100644
--- a/src/rpc/command_impl.h
+++ b/src/rpc/command_impl.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_map.cc b/src/rpc/command_map.cc
index 3a7964f5..17f253b7 100644
--- a/src/rpc/command_map.cc
+++ b/src/rpc/command_map.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_map.h b/src/rpc/command_map.h
index 3148d69a..4742bddd 100644
--- a/src/rpc/command_map.h
+++ b/src/rpc/command_map.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_scheduler.cc b/src/rpc/command_scheduler.cc
index a3020a73..97e0cae8 100644
--- a/src/rpc/command_scheduler.cc
+++ b/src/rpc/command_scheduler.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_scheduler.h b/src/rpc/command_scheduler.h
index 3a3bd893..d2bcef20 100644
--- a/src/rpc/command_scheduler.h
+++ b/src/rpc/command_scheduler.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_scheduler_item.cc b/src/rpc/command_scheduler_item.cc
index dddd436a..42a6ef43 100644
--- a/src/rpc/command_scheduler_item.cc
+++ b/src/rpc/command_scheduler_item.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/command_scheduler_item.h b/src/rpc/command_scheduler_item.h
index 8c8c7431..4556d249 100644
--- a/src/rpc/command_scheduler_item.h
+++ b/src/rpc/command_scheduler_item.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/exec_file.cc b/src/rpc/exec_file.cc
index 97aa7d49..bc9fe410 100644
--- a/src/rpc/exec_file.cc
+++ b/src/rpc/exec_file.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/exec_file.h b/src/rpc/exec_file.h
index 02cb8c55..6e70a07d 100644
--- a/src/rpc/exec_file.h
+++ b/src/rpc/exec_file.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/fixed_key.h b/src/rpc/fixed_key.h
index ebc61356..91b29d5a 100644
--- a/src/rpc/fixed_key.h
+++ b/src/rpc/fixed_key.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/ip_table_list.h b/src/rpc/ip_table_list.h
index d624a8e3..8a4e16cd 100644
--- a/src/rpc/ip_table_list.h
+++ b/src/rpc/ip_table_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/object_storage.cc b/src/rpc/object_storage.cc
index 1ee0b7c1..8d8a021c 100644
--- a/src/rpc/object_storage.cc
+++ b/src/rpc/object_storage.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/object_storage.h b/src/rpc/object_storage.h
index bcefec48..41a8e0f9 100644
--- a/src/rpc/object_storage.h
+++ b/src/rpc/object_storage.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/parse.cc b/src/rpc/parse.cc
index e1212e48..63a6d046 100644
--- a/src/rpc/parse.cc
+++ b/src/rpc/parse.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/parse.h b/src/rpc/parse.h
index 1ccf8f9c..95ab4760 100644
--- a/src/rpc/parse.h
+++ b/src/rpc/parse.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/parse_commands.cc b/src/rpc/parse_commands.cc
index f8a125a9..7eba5961 100644
--- a/src/rpc/parse_commands.cc
+++ b/src/rpc/parse_commands.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/parse_commands.h b/src/rpc/parse_commands.h
index 8fc162d0..bf3893e6 100644
--- a/src/rpc/parse_commands.h
+++ b/src/rpc/parse_commands.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/scgi.cc b/src/rpc/scgi.cc
index 4ffb81a1..3db40f00 100644
--- a/src/rpc/scgi.cc
+++ b/src/rpc/scgi.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/scgi.h b/src/rpc/scgi.h
index 7ba1daa4..3d0cf251 100644
--- a/src/rpc/scgi.h
+++ b/src/rpc/scgi.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/scgi_task.cc b/src/rpc/scgi_task.cc
index daf0973a..4d893bd5 100644
--- a/src/rpc/scgi_task.cc
+++ b/src/rpc/scgi_task.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/scgi_task.h b/src/rpc/scgi_task.h
index 2a9ef135..e75e9e1e 100644
--- a/src/rpc/scgi_task.h
+++ b/src/rpc/scgi_task.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/xmlrpc.cc b/src/rpc/xmlrpc.cc
index 4347401b..261259de 100644
--- a/src/rpc/xmlrpc.cc
+++ b/src/rpc/xmlrpc.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/rpc/xmlrpc.h b/src/rpc/xmlrpc.h
index 4bf16997..be909ec9 100644
--- a/src/rpc/xmlrpc.h
+++ b/src/rpc/xmlrpc.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/signal_handler.cc b/src/signal_handler.cc
index e5efecba..c3fb380a 100644
--- a/src/signal_handler.cc
+++ b/src/signal_handler.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/signal_handler.h b/src/signal_handler.h
index c6721d16..55403e97 100644
--- a/src/signal_handler.h
+++ b/src/signal_handler.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_base.cc b/src/thread_base.cc
index 715b8d10..936f382c 100644
--- a/src/thread_base.cc
+++ b/src/thread_base.cc
@@ -1,5 +1,5 @@
 // libTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_base.h b/src/thread_base.h
index f6bda7b3..8b4013c2 100644
--- a/src/thread_base.h
+++ b/src/thread_base.h
@@ -1,5 +1,5 @@
 // libTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_main.cc b/src/thread_main.cc
index 165f3e22..b87cae52 100644
--- a/src/thread_main.cc
+++ b/src/thread_main.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_main.h b/src/thread_main.h
index cfd488f3..41b7306d 100644
--- a/src/thread_main.h
+++ b/src/thread_main.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_worker.cc b/src/thread_worker.cc
index 7e9b972d..cdfe3323 100644
--- a/src/thread_worker.cc
+++ b/src/thread_worker.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/thread_worker.h b/src/thread_worker.h
index e04352a9..eba97ac4 100644
--- a/src/thread_worker.h
+++ b/src/thread_worker.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/download.cc b/src/ui/download.cc
index a772d26f..4f975f59 100644
--- a/src/ui/download.cc
+++ b/src/ui/download.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -391,8 +391,8 @@ Download::bind_keys() {
   m_bindings['+'] = sigc::mem_fun(this, &Download::receive_next_priority);
   m_bindings['-'] = sigc::mem_fun(this, &Download::receive_prev_priority);
 
-  m_bindings['t'] = sigc::bind(sigc::mem_fun(m_download->tracker_list(), &torrent::TrackerList::manual_request), false);
-  m_bindings['T'] = sigc::bind(sigc::mem_fun(m_download->tracker_list(), &torrent::TrackerList::manual_request), true);
+  m_bindings['t'] = sigc::bind(sigc::mem_fun(m_download->download(), &torrent::Download::manual_request), false);
+  m_bindings['T'] = sigc::bind(sigc::mem_fun(m_download->download(), &torrent::Download::manual_request), true);
 
   const char* keys = control->ui()->get_throttle_keys();
 
diff --git a/src/ui/download.h b/src/ui/download.h
index bedf523e..b00622d6 100644
--- a/src/ui/download.h
+++ b/src/ui/download.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
index f9e6ce4b..224d4d11 100644
--- a/src/ui/download_list.cc
+++ b/src/ui/download_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/download_list.h b/src/ui/download_list.h
index dda1b348..803de05d 100644
--- a/src/ui/download_list.h
+++ b/src/ui/download_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_base.cc b/src/ui/element_base.cc
index d7d530d5..a9e6024e 100644
--- a/src/ui/element_base.cc
+++ b/src/ui/element_base.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_base.h b/src/ui/element_base.h
index 10517ef2..0f6e335f 100644
--- a/src/ui/element_base.h
+++ b/src/ui/element_base.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_chunks_seen.cc b/src/ui/element_chunks_seen.cc
index 8ee1dd9a..2b734c22 100644
--- a/src/ui/element_chunks_seen.cc
+++ b/src/ui/element_chunks_seen.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_chunks_seen.h b/src/ui/element_chunks_seen.h
index 4f00c02f..68b81304 100644
--- a/src/ui/element_chunks_seen.h
+++ b/src/ui/element_chunks_seen.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_download_list.cc b/src/ui/element_download_list.cc
index 41b37bee..ec8a0126 100644
--- a/src/ui/element_download_list.cc
+++ b/src/ui/element_download_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_download_list.h b/src/ui/element_download_list.h
index ed5de30b..20185b50 100644
--- a/src/ui/element_download_list.h
+++ b/src/ui/element_download_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc
index 4ba9b1df..ac14095b 100644
--- a/src/ui/element_file_list.cc
+++ b/src/ui/element_file_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_file_list.h b/src/ui/element_file_list.h
index 4653fff6..9afe1aef 100644
--- a/src/ui/element_file_list.h
+++ b/src/ui/element_file_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_log_complete.cc b/src/ui/element_log_complete.cc
index f5edb846..194645ce 100644
--- a/src/ui/element_log_complete.cc
+++ b/src/ui/element_log_complete.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_log_complete.h b/src/ui/element_log_complete.h
index 78afbc1b..c02e2c4c 100644
--- a/src/ui/element_log_complete.h
+++ b/src/ui/element_log_complete.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_menu.cc b/src/ui/element_menu.cc
index 04130f36..7bc81cd0 100644
--- a/src/ui/element_menu.cc
+++ b/src/ui/element_menu.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_menu.h b/src/ui/element_menu.h
index d0674df5..a312e823 100644
--- a/src/ui/element_menu.h
+++ b/src/ui/element_menu.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_peer_list.cc b/src/ui/element_peer_list.cc
index 7b69f484..b3059c82 100644
--- a/src/ui/element_peer_list.cc
+++ b/src/ui/element_peer_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_peer_list.h b/src/ui/element_peer_list.h
index e1b67a47..680d1e39 100644
--- a/src/ui/element_peer_list.h
+++ b/src/ui/element_peer_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_string_list.cc b/src/ui/element_string_list.cc
index f386a908..f57b3f97 100644
--- a/src/ui/element_string_list.cc
+++ b/src/ui/element_string_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_string_list.h b/src/ui/element_string_list.h
index 82b1e4a0..fcd4b749 100644
--- a/src/ui/element_string_list.h
+++ b/src/ui/element_string_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_text.cc b/src/ui/element_text.cc
index a7496f2e..3d5bb923 100644
--- a/src/ui/element_text.cc
+++ b/src/ui/element_text.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_text.h b/src/ui/element_text.h
index 96fbe213..60b0516d 100644
--- a/src/ui/element_text.h
+++ b/src/ui/element_text.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_tracker_list.cc b/src/ui/element_tracker_list.cc
index 7d81b897..33a2774e 100644
--- a/src/ui/element_tracker_list.cc
+++ b/src/ui/element_tracker_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_tracker_list.h b/src/ui/element_tracker_list.h
index 58c3f6ce..c0d5ccfb 100644
--- a/src/ui/element_tracker_list.h
+++ b/src/ui/element_tracker_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_transfer_list.cc b/src/ui/element_transfer_list.cc
index 50eaec6d..045c9e7d 100644
--- a/src/ui/element_transfer_list.cc
+++ b/src/ui/element_transfer_list.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/element_transfer_list.h b/src/ui/element_transfer_list.h
index d8db338a..5db31da7 100644
--- a/src/ui/element_transfer_list.h
+++ b/src/ui/element_transfer_list.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/root.cc b/src/ui/root.cc
index 07abf349..d109976f 100644
--- a/src/ui/root.cc
+++ b/src/ui/root.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/ui/root.h b/src/ui/root.h
index e9a79075..cbc5ff43 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/directory.cc b/src/utils/directory.cc
index 5cf872af..0484c846 100644
--- a/src/utils/directory.cc
+++ b/src/utils/directory.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/directory.h b/src/utils/directory.h
index 2f616470..364c6f13 100644
--- a/src/utils/directory.h
+++ b/src/utils/directory.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/file_status_cache.cc b/src/utils/file_status_cache.cc
index 92c550ac..fc3cb085 100644
--- a/src/utils/file_status_cache.cc
+++ b/src/utils/file_status_cache.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/file_status_cache.h b/src/utils/file_status_cache.h
index 740b097a..44f92efc 100644
--- a/src/utils/file_status_cache.h
+++ b/src/utils/file_status_cache.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/list_focus.h b/src/utils/list_focus.h
index 337b88dd..5ad3ed4c 100644
--- a/src/utils/list_focus.h
+++ b/src/utils/list_focus.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc
index d81c71fb..c7579a95 100644
--- a/src/utils/lockfile.cc
+++ b/src/utils/lockfile.cc
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/lockfile.h b/src/utils/lockfile.h
index b5b1e80f..c54f8075 100644
--- a/src/utils/lockfile.h
+++ b/src/utils/lockfile.h
@@ -1,5 +1,5 @@
 // rTorrent - BitTorrent client
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/socket_fd.cc b/src/utils/socket_fd.cc
index 414d4f7e..338519d3 100644
--- a/src/utils/socket_fd.cc
+++ b/src/utils/socket_fd.cc
@@ -1,5 +1,5 @@
 // libTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/socket_fd.h b/src/utils/socket_fd.h
index 78987120..13766534 100644
--- a/src/utils/socket_fd.h
+++ b/src/utils/socket_fd.h
@@ -1,5 +1,5 @@
 // libTorrent - BitTorrent library
-// Copyright (C) 2005-2007, Jari Sundell
+// Copyright (C) 2005-2011, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by