Tons of optimizations and smaller additions