Merging documents and committing bugfix from 2b.
Pulling Alex's comments.