Finished index map, minor changes