step is now working on pause; minor cleanup