More Optimizations

Yay!