Update TODO

Add some more information bout desired refactorings.