Fixed some documentation
Some code fixed.

* This code is pending from review