Make entries sorted by value date
Hacking the description and the xml format
Fixing problems with the tests