fixed backfill bug, simplified indexing, removed old generator