Adjustements
Tweaks and speedups