Refactoring. Bug fixes. Improved performance.