Lots of good work, namely fixes and benchmark