Fix indexing + add some accessors