Bug fixes and performance optimization.