Spacing and word indexing fixes