Tons of performance improvements