some renaming
slightly better docstrings