Add another level of indexing.
Clean up the word padding.