fixups to adapt implementation to the API doc
fixups to adapt implementation to the API doc