Benchmarking and minor code tweaks