add missing indexes, part of #39

The speed improvement is insane...sorry for forgetting about this until now