fixed up timestamp skew / offset stuff