documentation and fix