Update documentation
Update comments