Merge docs
Fixed edge cases for new features.