-added some timestamp arithmetic and rebarized