Tested for multiple nics in type 2
Broke out IP and Name functions
Code stability fixes