Add some comments to TODO