Fixed timestamp logic. Fixed handling of the command string - we shouldn't quote
it, as it has already been quoted by the user.