Update documentation + fix a little bug