Improved comments; fixed source and destination IP attributes