Minor improvements in manual indexing.