Fish Sorter fixes, merged down fish changes, and the auto-dictionary