Add some comments
Update TODO