updated run, with fixes