todo updates and reorderings