Add info in Options and TODO section.