diff --git a/TODO b/TODO
index d77dac7..aad1854 100644
--- a/TODO
+++ b/TODO
@@ -26,18 +26,28 @@ euscan
 -- Berlios: nast, enigma, usbprog, python-wifi, wifi-radar, bcm43xx-fwcutter
 -- Google code: pychess, redis, rssguard, ostinato, pidgin-facebookchat
 
-metadata.xml
-------------
+### metadata.xml
 
-- Finalize format
 - Create a subtree of metadata using custom rules
+- Finalize format
 - Write a GLEP
+- Convert subtree
 - Commit metadata.xml changes to tree
 
 packages:
 - MySQL: should use http://downloads.mysql.com/archives/
 - mariadb: should use http://downloads.askmonty.org/MariaDB/+releases/
 
+
+### handlers
+
+- freecode: to scan freecode.com
+- remote-id: type deb repository. Example I always scan:
+  http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+  to see if google has release an update, same would help for all google
+  packages and some of the actual debian packages.
+  Something similar could be done for rpm repositories.
+
 euscanwww
 ---------
 
@@ -47,7 +57,6 @@ euscanwww
 
 ### packages
 
-
 - show additional informations in the web interface (remote-id, etc...)
 - show the content of the ebuild for a particular version
 - Ignore alpha/beta if current is not alpha/beta: per-package setting using metadata.xml ?
@@ -59,14 +68,21 @@ euscanwww
 
 Move account stuff to an euscan.account application to keep only package related stuff in djeuscan.
 
+### logs
+
+Move log models into djeuscanhistory ?
+
 ### models
 
 - Repository (added or not, from layman + repositories.xml)
 - Category (read metadata.xml)
 - Url ad ManyToMany
 - Arches and Keyword
+- Metadata, herds, maintainers and homepage are per-version, not per package. Store it in Version instead.
+  Define last_version that refers to the last version (can be last_version_gentoo or last_version_overlay)
+  Fix update_counter, to update this field.
 
-### djportage
+### djportage (LOW-PRIORITY))
 
 - Create standalone application to scan and represent portage trees in models using work done in:
 -- euscan
@@ -80,9 +96,11 @@ The scan process should be faster than the one using euscan. gentoo-packages hav
 ### Scanning
 
 - Remove alive field
-- Find a way to rescan upstream of packages recently changed in portage
+- Find a way to rescan upstream of packages recently changed in portage:
+  - make scan_portage/scan_upstream return a list of packages that were updated (or list of versions ?)
+  - use that list in tasks.py as scan_upstream (should be easy using chains and subtasks)
 
-### API
+### API (LOW-PRIORITY)
 
 - Move to tastypie
 
diff --git a/euscanwww/djeuscan/management/commands/scan_upstream.py b/euscanwww/djeuscan/management/commands/scan_upstream.py
index e941e73..a1528d4 100644
--- a/euscanwww/djeuscan/management/commands/scan_upstream.py
+++ b/euscanwww/djeuscan/management/commands/scan_upstream.py
@@ -9,7 +9,6 @@ from djeuscan.processing.scan import scan_upstream
 
 logger = logging.getLogger(__name__)
 
-
 class Command(BaseCommand):
     _overlays = {}
 
diff --git a/euscanwww/djeuscan/processing/misc/update_portage_trees.py b/euscanwww/djeuscan/processing/misc/update_portage_trees.py
index 6e309c5..b54508c 100644
--- a/euscanwww/djeuscan/processing/misc/update_portage_trees.py
+++ b/euscanwww/djeuscan/processing/misc/update_portage_trees.py
@@ -112,11 +112,11 @@ def update_portage_trees(logger=None):
     logger = logger or FakeLogger()
     logger.info("Running emerge --sync")
     emerge_sync(logger)
+    emerge_metadata(logger)
     logger.info("Running layman --sync")
     layman_sync(logger, cache=True)
     #logger.info("Running emerge --regen")
     #emerge_regen(logger)
-    emerge_metadata(logger)
     logger.info("Running eix-update")
     eix_update(logger)
     logger.info("Done!")
diff --git a/euscanwww/djeuscan/tasks.py b/euscanwww/djeuscan/tasks.py
index f70c8fe..b9aa92b 100644
--- a/euscanwww/djeuscan/tasks.py
+++ b/euscanwww/djeuscan/tasks.py
@@ -365,4 +365,7 @@ admin_tasks = [
     update_portage,
     update_upstream,
     scan_package,
+    send_update_email,
+    send_weekly_email,
+    send_monthly_email,
 ]
diff --git a/euscanwww/djeuscan/templates/euscan/about.html b/euscanwww/djeuscan/templates/euscan/about.html
index 83b5b87..7079cc2 100644
--- a/euscanwww/djeuscan/templates/euscan/about.html
+++ b/euscanwww/djeuscan/templates/euscan/about.html
@@ -9,7 +9,7 @@
   This web interface allow you to browse the portage tree, and find outdated ebuilds. It is designed to help maintainers monitor their packages and bump them.
 </p>
 <p>
-  euscan code source is available at <a href="http://git.iksaif.net/?p=djeuscan.git;a=summary">http://git.iksaif.net/?p=euscan.git;a=summary</a>.
+  euscan code source is available on <a href="http://github.com/iksaif/euscan">github</a>.
 </p>
 <p>
   Original Gentoo artwork and logos copyright (C) Gentoo Foundation.
diff --git a/euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt b/euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt
index c17c339..baf396b 100644
--- a/euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt
+++ b/euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt
@@ -29,3 +29,4 @@ Watching {{ num_packages }} package{{ num_packages|pluralize:"s"}}: {{ packages_
 {% endif %}{% endif %}{% endwith %}
 --
 This email was sent by euscan, please do not reply.
+Go to your euscan account to change email notification settings.