small changes to run, u1, and diag