Documented some internals.
Addressed a small merge conflict.