Merge TODOs
[DOC] Minor changes