More minor changes, updates to index