Fixed non incrementing index, doe! Oh and a rename