Fix RERUN mode for dev, and adjust text output slightly