Minor changes.
Docstring fixes.
Unit test for the scope feature.