Updated output formatting.  Misc other changes.