Added more to the index, fixed some stuff
Merge fix