* Small builder and documentation improvement.