G31 bug fix, add A31 Ax for autocal and max run times if x defined