Massive commit.
Optimized most things.