diff --git a/tools/SMBFinger/Finger.py b/tools/SMBFinger/Finger.py
index f0921b1..722049d 100755
--- a/tools/SMBFinger/Finger.py
+++ b/tools/SMBFinger/Finger.py
@@ -21,103 +21,103 @@ from odict import OrderedDict
 __version__ = "0.3"
 Timeout = 0.5
 class Packet():
-    fields = OrderedDict([
-    ])
-    def __init__(self, **kw):
-        self.fields = OrderedDict(self.__class__.fields)
-        for k,v in kw.items():
-            if callable(v):
-                self.fields[k] = v(self.fields[k])
-            else:
-                self.fields[k] = v
-    def __str__(self):
-        return "".join(map(str, self.fields.values()))
+		fields = OrderedDict([
+		])
+		def __init__(self, **kw):
+				self.fields = OrderedDict(self.__class__.fields)
+				for k,v in kw.items():
+						if callable(v):
+								self.fields[k] = v(self.fields[k])
+						else:
+								self.fields[k] = v
+		def __str__(self):
+				return "".join(map(str, self.fields.values()))
 
 def longueur(payload):
-    length = struct.pack(">i", len(''.join(payload)))
-    return length
+		length = struct.pack(">i", len(''.join(payload)))
+		return length
 
 class SMBHeader(Packet):
-    fields = OrderedDict([
-        ("proto",      "\xff\x53\x4d\x42"),
-        ("cmd",        "\x72"),
-        ("error-code", "\x00\x00\x00\x00" ),
-        ("flag1",      "\x00"),
-        ("flag2",      "\x00\x00"),
-        ("pidhigh",    "\x00\x00"),
-        ("signature",  "\x00\x00\x00\x00\x00\x00\x00\x00"),
-        ("reserved",   "\x00\x00"),
-        ("tid",        "\x00\x00"),
-        ("pid",        "\x00\x00"),
-        ("uid",        "\x00\x00"),
-        ("mid",        "\x00\x00"),
-    ])
+		fields = OrderedDict([
+				("proto",      "\xff\x53\x4d\x42"),
+				("cmd",        "\x72"),
+				("error-code", "\x00\x00\x00\x00" ),
+				("flag1",      "\x00"),
+				("flag2",      "\x00\x00"),
+				("pidhigh",    "\x00\x00"),
+				("signature",  "\x00\x00\x00\x00\x00\x00\x00\x00"),
+				("reserved",   "\x00\x00"),
+				("tid",        "\x00\x00"),
+				("pid",        "\x00\x00"),
+				("uid",        "\x00\x00"),
+				("mid",        "\x00\x00"),
+		])
 
 class SMBNego(Packet):
-    fields = OrderedDict([
-        ("Wordcount", "\x00"),
-        ("Bcc", "\x62\x00"),
-        ("Data", "")
-    ])
-    
-    def calculate(self):
-        self.fields["Bcc"] = struct.pack("<h",len(str(self.fields["Data"])))
+		fields = OrderedDict([
+				("Wordcount", "\x00"),
+				("Bcc", "\x62\x00"),
+				("Data", "")
+		])
+		
+		def calculate(self):
+				self.fields["Bcc"] = struct.pack("<h",len(str(self.fields["Data"])))
 
 class SMBNegoData(Packet):
-    fields = OrderedDict([
-        ("BuffType","\x02"),
-        ("Dialect", "NT LM 0.12\x00"),
-    ])
+		fields = OrderedDict([
+				("BuffType","\x02"),
+				("Dialect", "NT LM 0.12\x00"),
+		])
 
 
 class SMBSessionFingerData(Packet):
-    fields = OrderedDict([
-        ("wordcount", "\x0c"),
-        ("AndXCommand", "\xff"),
-        ("reserved","\x00" ),
-        ("andxoffset", "\x00\x00"),
-        ("maxbuff","\x04\x11"),
-        ("maxmpx", "\x32\x00"),
-        ("vcnum","\x00\x00"),
-        ("sessionkey", "\x00\x00\x00\x00"),
-        ("securitybloblength","\x4a\x00"),
-        ("reserved2","\x00\x00\x00\x00"),
-        ("capabilities", "\xd4\x00\x00\xa0"),
-        ("bcc1",""),
-        ("Data","\x60\x48\x06\x06\x2b\x06\x01\x05\x05\x02\xa0\x3e\x30\x3c\xa0\x0e\x30\x0c\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a\xa2\x2a\x04\x28\x4e\x54\x4c\x4d\x53\x53\x50\x00\x01\x00\x00\x00\x07\x82\x08\xa2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x01\x28\x0a\x00\x00\x00\x0f\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32\x00\x20\x00\x53\x00\x65\x00\x72\x00\x76\x00\x69\x00\x63\x00\x65\x00\x20\x00\x50\x00\x61\x00\x63\x00\x6b\x00\x20\x00\x33\x00\x20\x00\x32\x00\x36\x00\x30\x00\x30\x00\x00\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32\x00\x20\x00\x35\x00\x2e\x00\x31\x00\x00\x00\x00\x00"),
+		fields = OrderedDict([
+				("wordcount", "\x0c"),
+				("AndXCommand", "\xff"),
+				("reserved","\x00" ),
+				("andxoffset", "\x00\x00"),
+				("maxbuff","\x04\x11"),
+				("maxmpx", "\x32\x00"),
+				("vcnum","\x00\x00"),
+				("sessionkey", "\x00\x00\x00\x00"),
+				("securitybloblength","\x4a\x00"),
+				("reserved2","\x00\x00\x00\x00"),
+				("capabilities", "\xd4\x00\x00\xa0"),
+				("bcc1",""),
+				("Data","\x60\x48\x06\x06\x2b\x06\x01\x05\x05\x02\xa0\x3e\x30\x3c\xa0\x0e\x30\x0c\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a\xa2\x2a\x04\x28\x4e\x54\x4c\x4d\x53\x53\x50\x00\x01\x00\x00\x00\x07\x82\x08\xa2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x01\x28\x0a\x00\x00\x00\x0f\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32\x00\x20\x00\x53\x00\x65\x00\x72\x00\x76\x00\x69\x00\x63\x00\x65\x00\x20\x00\x50\x00\x61\x00\x63\x00\x6b\x00\x20\x00\x33\x00\x20\x00\x32\x00\x36\x00\x30\x00\x30\x00\x00\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x32\x00\x30\x00\x30\x00\x32\x00\x20\x00\x35\x00\x2e\x00\x31\x00\x00\x00\x00\x00"),
 
-    ])
-    def calculate(self):
-        self.fields["bcc1"] = struct.pack("<i", len(str(self.fields["Data"])))[:2]
+		])
+		def calculate(self):
+				self.fields["bcc1"] = struct.pack("<i", len(str(self.fields["Data"])))[:2]
 
 ##Now Lanman
 class SMBHeaderLanMan(Packet):
-    fields = OrderedDict([
-        ("proto", "\xff\x53\x4d\x42"),
-        ("cmd", "\x72"),
-        ("error-code", "\x00\x00\x00\x00" ),
-        ("flag1", "\x08"),
-        ("flag2", "\x01\xc8"),
-        ("pidhigh", "\x00\x00"),
-        ("signature", "\x00\x00\x00\x00\x00\x00\x00\x00"),
-        ("reserved", "\x00\x00"),
-        ("tid", "\x00\x00"),
-        ("pid", "\x3c\x1b"),
-        ("uid", "\x00\x00"),
-        ("mid", "\x00\x00"),
-    ])
+		fields = OrderedDict([
+				("proto", "\xff\x53\x4d\x42"),
+				("cmd", "\x72"),
+				("error-code", "\x00\x00\x00\x00" ),
+				("flag1", "\x08"),
+				("flag2", "\x01\xc8"),
+				("pidhigh", "\x00\x00"),
+				("signature", "\x00\x00\x00\x00\x00\x00\x00\x00"),
+				("reserved", "\x00\x00"),
+				("tid", "\x00\x00"),
+				("pid", "\x3c\x1b"),
+				("uid", "\x00\x00"),
+				("mid", "\x00\x00"),
+		])
 
 class SMBNegoDataLanMan(Packet):
-    fields = OrderedDict([
-        ("Wordcount", "\x00"),
-        ("Bcc", "\x54\x00"),
-        ("BuffType","\x02"),
-        ("Dialect", "NT LM 0.12\x00"),
+		fields = OrderedDict([
+				("Wordcount", "\x00"),
+				("Bcc", "\x54\x00"),
+				("BuffType","\x02"),
+				("Dialect", "NT LM 0.12\x00"),
 
-    ])
-    def calculate(self):
-        CalculateBCC = str(self.fields["BuffType"])+str(self.fields["Dialect"])
-        self.fields["Bcc"] = struct.pack("<h",len(CalculateBCC))
+		])
+		def calculate(self):
+				CalculateBCC = str(self.fields["BuffType"])+str(self.fields["Dialect"])
+				self.fields["Bcc"] = struct.pack("<h",len(CalculateBCC))
 
 #####################
 
@@ -125,16 +125,16 @@ def color(txt, code = 1, modifier = 0):
 	return "\033[%d;3%dm%s\033[0m" % (modifier, code, txt)
 
 def IsSigningEnabled(data): 
-    if data[39] == "\x0f":
-        return True
-    else:
-        return False
+		if data[39] == "\x0f":
+				return True
+		else:
+				return False
 
 def atod(a): 
-    return struct.unpack("!L",inet_aton(a))[0]
+		return struct.unpack("!L",inet_aton(a))[0]
 
 def dtoa(d): 
-    return inet_ntoa(struct.pack("!L", d))
+		return inet_ntoa(struct.pack("!L", d))
 
 def OsNameClientVersion(data):
 	try:
@@ -143,115 +143,120 @@ def OsNameClientVersion(data):
 		return OsVersion, ClientVersion
 
 	except:
-	 	return "Could not fingerprint Os version.", "Could not fingerprint LanManager Client version"
+		return "Could not fingerprint Os version.", "Could not fingerprint LanManager Client version"
 
 def GetHostnameAndDomainName(data):
 	try:
 		DomainJoined, Hostname = tuple([e.replace('\x00','') for e in data[81:].split('\x00\x00\x00')[:2]])
+		#If max length domain name, there won't be a \x00\x00\x00 delineator to split on
+		if Hostname == '':
+			DomainJoined = data[81:110].replace('\x00','')
+			Hostname = data[113:].replace('\x00','')
+
 		return Hostname, DomainJoined
 	except:
-	 	return "Could not get Hostname.", "Could not get Domain joined"
+		return "Could not get Hostname.", "Could not get Domain joined"
 
 def DomainGrab(Host):
-    s = socket(AF_INET, SOCK_STREAM)
-    try:
-       s.settimeout(Timeout)
-       s.connect(Host)
-    except:
-       print "Host down or port close, skipping"
-       pass
-    try:
-       h = SMBHeaderLanMan(cmd="\x72",mid="\x01\x00",flag1="\x00", flag2="\x00\x00")
-       n = SMBNegoDataLanMan()
-       n.calculate()
-       packet0 = str(h)+str(n)
-       buffer0 = longueur(packet0)+packet0
-       s.send(buffer0)
-       data = s.recv(2048)
-       s.close()
-       if data[8:10] == "\x72\x00":
-          return GetHostnameAndDomainName(data)
-    except:
-       pass 
+		s = socket(AF_INET, SOCK_STREAM)
+		try:
+			 s.settimeout(Timeout)
+			 s.connect(Host)
+		except:
+			 print "Host down or port close, skipping"
+			 pass
+		try:
+			 h = SMBHeaderLanMan(cmd="\x72",mid="\x01\x00",flag1="\x00", flag2="\x00\x00")
+			 n = SMBNegoDataLanMan()
+			 n.calculate()
+			 packet0 = str(h)+str(n)
+			 buffer0 = longueur(packet0)+packet0
+			 s.send(buffer0)
+			 data = s.recv(2048)
+			 s.close()
+			 if data[8:10] == "\x72\x00":
+					return GetHostnameAndDomainName(data)
+		except:
+			 pass 
 
 def SmbFinger(Host):
-    s = socket(AF_INET, SOCK_STREAM)
-    try:
-       s.settimeout(Timeout)
-       s.connect(Host)
-    except:
-       print "Host down or port close, skipping"
-       pass
-    try:     
-       h = SMBHeader(cmd="\x72",flag1="\x18",flag2="\x53\xc8")
-       n = SMBNego(Data = SMBNegoData())
-       n.calculate()
-       packet0 = str(h)+str(n)
-       buffer0 = longueur(packet0)+packet0
-       s.send(buffer0)
-       data = s.recv(2048)
-       signing = IsSigningEnabled(data)
-       if data[8:10] == "\x72\x00":
-          head = SMBHeader(cmd="\x73",flag1="\x18",flag2="\x17\xc8",uid="\x00\x00")
-          t = SMBSessionFingerData()
-          t.calculate() 
-          packet0 = str(head)+str(t)
-          buffer1 = longueur(packet0)+packet0  
-          s.send(buffer1) 
-          data = s.recv(2048)
-          s.close()
-       if data[8:10] == "\x73\x16":
-          OsVersion, ClientVersion = OsNameClientVersion(data)
-          return signing, OsVersion, ClientVersion
-    except:
-       pass
+		s = socket(AF_INET, SOCK_STREAM)
+		try:
+			 s.settimeout(Timeout)
+			 s.connect(Host)
+		except:
+			 print "Host down or port close, skipping"
+			 pass
+		try:     
+			 h = SMBHeader(cmd="\x72",flag1="\x18",flag2="\x53\xc8")
+			 n = SMBNego(Data = SMBNegoData())
+			 n.calculate()
+			 packet0 = str(h)+str(n)
+			 buffer0 = longueur(packet0)+packet0
+			 s.send(buffer0)
+			 data = s.recv(2048)
+			 signing = IsSigningEnabled(data)
+			 if data[8:10] == "\x72\x00":
+					head = SMBHeader(cmd="\x73",flag1="\x18",flag2="\x17\xc8",uid="\x00\x00")
+					t = SMBSessionFingerData()
+					t.calculate() 
+					packet0 = str(head)+str(t)
+					buffer1 = longueur(packet0)+packet0  
+					s.send(buffer1) 
+					data = s.recv(2048)
+					s.close()
+			 if data[8:10] == "\x73\x16":
+					OsVersion, ClientVersion = OsNameClientVersion(data)
+					return signing, OsVersion, ClientVersion
+		except:
+			 pass
 ##################
 #run it
 def ShowResults(Host):
-    s = socket(AF_INET, SOCK_STREAM)
-    try:
-       s.settimeout(Timeout)
-       s.connect(Host)
-    except:
-       return False
+		s = socket(AF_INET, SOCK_STREAM)
+		try:
+			 s.settimeout(Timeout)
+			 s.connect(Host)
+		except:
+			 return False
 
-    try:
-       Hostname, DomainJoined = DomainGrab(Host)
-       Signing, OsVer, LanManClient = SmbFinger(Host)
-       enabled  = color("SMB signing is mandatory. Choose another target", 1, 1)
-       disabled = color("SMB signing: False", 2, 1)
-       print color("Retrieving information for %s..."%Host[0], 8, 1)
-       print enabled if Signing else disabled
-       print color("Os version: '%s'"%(OsVer), 8, 3)
-       print color("Hostname: '%s'\nPart of the '%s' domain"%(Hostname, DomainJoined), 8, 3)
-    except:
-       pass
+		try:
+			 Hostname, DomainJoined = DomainGrab(Host)
+			 Signing, OsVer, LanManClient = SmbFinger(Host)
+			 enabled  = color("SMB signing is mandatory. Choose another target", 1, 1)
+			 disabled = color("SMB signing: False", 2, 1)
+			 print color("Retrieving information for %s..."%Host[0], 8, 1)
+			 print enabled if Signing else disabled
+			 print color("Os version: '%s'"%(OsVer), 8, 3)
+			 print color("Hostname: '%s'\nPart of the '%s' domain"%(Hostname, DomainJoined), 8, 3)
+		except:
+			 pass
 
 def ShowSmallResults(Host):
-    s = socket(AF_INET, SOCK_STREAM)
-    try:
-       s.settimeout(Timeout)
-       s.connect(Host)
-    except:
-       return False
+		s = socket(AF_INET, SOCK_STREAM)
+		try:
+			 s.settimeout(Timeout)
+			 s.connect(Host)
+		except:
+			 return False
 
-    try:
-       Hostname, DomainJoined = DomainGrab(Host)
-       Signing, OsVer, LanManClient = SmbFinger(Host)
-       Message = color("\n[+] Client info: ['%s', domain: '%s', signing:'%s']"%(OsVer, DomainJoined, Signing),4,0)
-       return Message
-    except:
-       pass
+		try:
+			 Hostname, DomainJoined = DomainGrab(Host)
+			 Signing, OsVer, LanManClient = SmbFinger(Host)
+			 Message = color("\n[+] Client info: ['%s', domain: '%s', signing:'%s']"%(OsVer, DomainJoined, Signing),4,0)
+			 return Message
+		except:
+			 pass
 
 
 def RunFinger(Host):
-    m = re.search("/", str(Host))
-    if m :
-       net,_,mask = Host.partition('/')
-       mask = int(mask)
-       net = atod(net)
-       for host in (dtoa(net+n) for n in range(0, 1<<32-mask)):
-           ShowResults((host,445))
-    else:
-       ShowResults((Host,445))   
+		m = re.search("/", str(Host))
+		if m :
+			 net,_,mask = Host.partition('/')
+			 mask = int(mask)
+			 net = atod(net)
+			 for host in (dtoa(net+n) for n in range(0, 1<<32-mask)):
+					 ShowResults((host,445))
+		else:
+			 ShowResults((Host,445))