A ton of improvements to make things faster.