simplify indexers, plus some bugfixes