Improved documentation for index option as well as code parity with spec