Moved improvements to TODO