bunch of revisions; some index work