Update main
Some improve
Update documentation