Updated doc
Another todo done