A few final tweaks to the scope fixes, and update docstrings