Fix bug in time stamp handling.

And rename some tools.