Massive amount of improvements/optimizations