Updating doc to pass tests, updating for review comments