s7 and Index typos corrected