Doc and Todo
* Updated documentation 
* Fixed some documentation
* Updated todo