Merge "Document changes and clean up spec"