Bugs fixes and performance improvements.