New changes woo!

Optimizations instead of bugfixes, what is this!