stop and step states now more explicit; timestep time now includes stop and step times