More generic template support, icmp fix, timeout-rate, and minor changes.