Function headers in liveness output & minor output tweaks