fixed variale names, and spread ramp to both straight moves