Basic packet tracking

Very minimal changes - mainly to log messages.