More additions and documentation clarification.