Corrected issues with speedCalc