Development

Merge some documentation changes.