Fixes and speedups
Speedup
New speedups