more timestamp tweaks