Significantly expanded comments