Tons of bug fixes and a few feature enhancements