Adjust docstrings and make other small fixes