add timestamps, fix display