Fixes and better performance comparisons