Add documentation
Fix modification issues