Done my last check - a few docstring adjustments and one additional multi-liner.