Update and re-order based on priorities in TODO

darcs-hash:20090125122345-58252-8f4dbee7baee49cf1537fbfbe65cd9fd3a3ade79