arrows: a bit more work; get rid of all undefined's