More fixes to brush handling, restored animation support