~30X speed increase for indexing
Better command line interface