Update documentation, merge parts.