Added a few features, made index more clear.