Merged in edits to docs