Retain snag time as well.  Fix bug using now instead of timestamp.