Few clarification fixes