Fixes, add performance