minor improvements, important location index improvement