update TODO
original section order
better text