add support for some new fields and some output cleanups.