r2029: corrections