diff --git a/TODO.md b/TODO.md
index b79c8668..51832d07 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,7 @@
 * Replace picocontainer with dagger: http://square.github.io/dagger/
+* Add URLFetcher with configurable URL and JSON/XPath expression
+* WHOIS fetcher
+
 * Windows: net stop SharedAccess
 * gtk sort direction arrows
 * advanced exporting options dialog (with append checkbox)
@@ -6,8 +9,6 @@
 * Opener Launchers to the details window
 * multiple port support web-detect, opening in browser selects scanned ports if available
 * add new fetchers by configuration of PortTextFetcher
-* startup as root option
-* compile librocksaw for mac and linux64
 * public XSL for XMLExporter
 * Easier adding/removing of columns to the result table (without resetting the results)
 * command-line: support favorites
@@ -15,16 +16,15 @@
 * find not-null for column
 * export/import of settings (profiles or tie with Favorites?)
 * display friendly names of ports
-* display manufacturers of mac addresses
 * preferences profiles (tied to favorites?)
-* offer installation on Windows
 * free text (advanced) feeder
 * saving and restoring of results together with all options
 * advanced find (firefox-like) with options Find Next, Find Previoius, Select all matches
 * count occurencies of search (either separate or included)
-* use jpcap for raw packet injection and ARP scanning
-* save/restore results
 * diff with saved
-* WHOIS fetcher
 * show distinct values for a column
 * SWT bug: deleting of many IPs at once is very slow (freezes the ipscan) due to the sorting of provided indices
+
+* use jpcap for raw packet injection and ARP scanning
+* startup as root option
+* compile librocksaw for mac and linux64