Fixed animations, sorters, and other misc