Bug fixes which improve performance. Yay!