bring over more recent changes: 1. include timestamp in stdout output; add newer output formats