better spot removal and expanded comments