bugfixes and index option