catching the outbound traffic.  other small mods.
fixed the teardown/cleanup stuff