Even nicer output. Covered all cases now, except Done and Fail, I think.