Update and reorganize TODO