Update TODO

removed idea and sorted them