Minor tweaks and some docstrings