minor changes to how timestamps are tackled