-Refactored index calculation code;
-Corrected step timestamp display issues;