removed assertion, fixed waypoints in ff