More speedups.
WIP
WIP
FIX
WIP
WIP
FIX