sync of topology functions with docs and tests