add a vcs field to output + cleanups