adjustments to timestamps and a bit of cleanup