Completed the documentation and cleanup
Some typo on the doc...