Optimizations, benchmarking, bug fixes.