add timestamps and other improvements