More optimizations and indexes for #75