Fix a few things here and there, add support for non-* indices