Fix comments
Improve the docs