Fixes and performance