finish all current tests passing, add geo index option, other cleanup