Source and Destination IP to Packet

Add source and destination IP to packet. Other minor changes