Tabs -> spaces
Minor bug fixes and s/tab/spaces
Better naming of benchmarks