Moved some elements, and added a simple benchmark.