Addeed initial pcap code and related fixups