A bug fix and cosmetics in "run" script