Fixed bug in r2s_step2.py refactoring; Comments/docstrings.