index -> indexed, plus other tweaks