Further improved documentation