Reorganize initial data file to make it easier to edit.
Fix calls to __unicode__ and maturity().
update TODO list