misc renames, some docstrings on types.