finished importing brushes, various other fixes