Brushing up and small changes