minor improvements, important location index improvement
merge
merged