cleaned up inconsistencies with index