brush masks: some more fixes