added a bunch of things
changing the indexes a bit