fixed speed calculation
step calculation fixes