Updated indexing for accurate progress and improved raw ndx values.