Brush and general code cleanup

Brushes now look after fading rather than a global fade.