Updated/expanded comments