Content shifted in, temporary index created.

Closes #7.
Merge branch 'fix-content-cleanups'