adds timestamp improvements