diff --git a/README.md b/README.md
index 4483819..f594107 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Fork me on [GitHub](https://github.com/the-useless-one/pywerview).
 
 ![License](https://img.shields.io/github/license/the-useless-one/pywerview.svg?maxAge=2592000)
 ![Python versions](https://img.shields.io/pypi/pyversions/pywerview.svg?maxAge=2592000)
-[![GitHub release](https://img.shields.io/github/release/the-useless-one/pywerview.svg?maxAge=2592001&label=GitHub%20release)](https://github.com/the-useless-one/pywerview/releases/latest)
+[![GitHub release](https://img.shields.io/github/release/the-useless-one/pywerview.svg?maxAge=2592000&label=GitHub%20release)](https://github.com/the-useless-one/pywerview/releases/latest)
 [![PyPI version](https://img.shields.io/pypi/v/pywerview.svg?maxAge=2592000)](https://pypi.python.org/pypi/pywerview)
 
 ## HISTORY
diff --git a/pywerview/cli/helpers.py b/pywerview/cli/helpers.py
index b74f520..80f5721 100644
--- a/pywerview/cli/helpers.py
+++ b/pywerview/cli/helpers.py
@@ -27,9 +27,9 @@ def get_adobject(domain_controller, domain, user, password=str(),
                 lmhash=str(), nthash=str(), queried_domain=str(), queried_sid=str(),
                 queried_name=str(), queried_sam_account_name=str(), ads_path=str(),
                 custom_filter=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_adobject(queried_domain=queried_domain,
+	return requester.get_adobject(queried_domain=queried_domain,
                     queried_sid=queried_sid, queried_name=queried_name,
                     queried_sam_account_name=queried_sam_account_name,
                     ads_path=ads_path, custom_filter=custom_filter)
@@ -37,21 +37,21 @@ def get_adobject(domain_controller, domain, user, password=str(),
 def get_netuser(domain_controller, domain, user, password=str(), lmhash=str(),
                 nthash=str(), queried_username=str(), queried_domain=str(), ads_path=str(),
                 admin_count=False, spn=False, unconstrained=False, allow_delegation=False,
-                preauth_notreq=False, custom_filter=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+                custom_filter=str()):
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netuser(queried_username=queried_username,
+	return requester.get_netuser(queried_username=queried_username,
                                     queried_domain=queried_domain, ads_path=ads_path, admin_count=admin_count,
                                     spn=spn, unconstrained=unconstrained, allow_delegation=allow_delegation,
-                                    preauth_notreq=preauth_notreq, custom_filter=custom_filter)
+                                    custom_filter=custom_filter)
 
 def get_netgroup(domain_controller, domain, user, password=str(),
                 lmhash=str(), nthash=str(), queried_groupname='*', queried_sid=str(),
                 queried_username=str(), queried_domain=str(), ads_path=str(),
                 admin_count=False, full_data=False, custom_filter=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                 lmhash, nthash)
-    return requester.get_netgroup(queried_groupname=queried_groupname,
+	return requester.get_netgroup(queried_groupname=queried_groupname,
                                     queried_sid=queried_sid, queried_username=queried_username,
                                     queried_domain=queried_domain, ads_path=ads_path, admin_count=admin_count,
                                     full_data=full_data, custom_filter=custom_filter)
@@ -61,9 +61,9 @@ def get_netcomputer(domain_controller, domain, user, password=str(),
                     queried_os=str(), queried_sp=str(), queried_domain=str(), ads_path=str(),
                     printers=False, unconstrained=False, ping=False, full_data=False,
                     custom_filter=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netcomputer(queried_computername=queried_computername,
+	return requester.get_netcomputer(queried_computername=queried_computername,
                                         queried_spn=queried_spn, queried_os=queried_os, queried_sp=queried_sp,
                                         queried_domain=queried_domain, ads_path=ads_path, printers=printers,
                                         unconstrained=unconstrained, ping=ping, full_data=full_data,
@@ -71,63 +71,57 @@ def get_netcomputer(domain_controller, domain, user, password=str(),
 
 def get_netdomaincontroller(domain_controller, domain, user, password=str(),
                                  lmhash=str(), nthash=str(), queried_domain=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netdomaincontroller(queried_domain=queried_domain)
+	return requester.get_netdomaincontroller(queried_domain=queried_domain)
 
 def get_netfileserver(domain_controller, domain, user, password=str(),
                                  lmhash=str(), nthash=str(), queried_domain=str(), target_users=list()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netfileserver(queried_domain=queried_domain,
+	return requester.get_netfileserver(queried_domain=queried_domain,
                                             target_users=target_users)
 
 def get_dfsshare(domain_controller, domain, user, password=str(),
                  lmhash=str(), nthash=str(), version=['v1', 'v2'], queried_domain=str(),
                  ads_path=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_dfsshare(version=version, queried_domain=queried_domain, ads_path=ads_path)
+	return requester.get_dfsshare(version=version, queried_domain=queried_domain, ads_path=ads_path)
 
 def get_netou(domain_controller, domain, user, password=str(), lmhash=str(),
               nthash=str(), queried_domain=str(), queried_ouname='*', queried_guid=str(),
               ads_path=str(), full_data=False):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netou(queried_domain=queried_domain,
+	return requester.get_netou(queried_domain=queried_domain,
                                    queried_ouname=queried_ouname, queried_guid=queried_guid, ads_path=ads_path,
                                    full_data=full_data)
 
 def get_netsite(domain_controller, domain, user, password=str(), lmhash=str(),
                 nthash=str(), queried_domain=str(), queried_sitename=str(),
                 queried_guid=str(), ads_path=str(), full_data=False):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netsite(queried_domain=queried_domain,
+	return requester.get_netsite(queried_domain=queried_domain,
                                     queried_sitename=queried_sitename, queried_guid=queried_guid,
                                     ads_path=ads_path, full_data=full_data)
 
 def get_netsubnet(domain_controller, domain, user, password=str(),
                   lmhash=str(), nthash=str(), queried_domain=str(), queried_sitename=str(),
                   ads_path=str(), full_data=False):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netsubnet(queried_domain=queried_domain,
+	return requester.get_netsubnet(queried_domain=queried_domain,
                                        queried_sitename=queried_sitename, ads_path=ads_path, full_data=full_data)
 
-def get_netdomaintrust(domain_controller, domain, user, password=str(),
-                  lmhash=str(), nthash=str(), queried_domain=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
-                                 lmhash, nthash)
-    return requester.get_netdomaintrust(queried_domain=queried_domain)
-
 def get_netgroupmember(domain_controller, domain, user, password=str(),
                        lmhash=str(), nthash=str(), queried_groupname=str(), queried_sid=str(),
                        queried_domain=str(), ads_path=str(), recurse=False, use_matching_rule=False,
                        full_data=False, custom_filter=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netgroupmember(queried_groupname=queried_groupname,
+	return requester.get_netgroupmember(queried_groupname=queried_groupname,
                                             queried_sid=queried_sid, queried_domain=queried_domain,
                                             ads_path=ads_path, recurse=recurse,
                                             use_matching_rule=use_matching_rule,
@@ -135,88 +129,88 @@ def get_netgroupmember(domain_controller, domain, user, password=str(),
 
 def get_netsession(target_computername, domain, user, password=str(),
                    lmhash=str(), nthash=str()):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netsession()
+	return requester.get_netsession()
 
 def get_netshare(target_computername, domain, user, password=str(),
                                  lmhash=str(), nthash=str()):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netshare()
+	return requester.get_netshare()
 
 def get_localdisks(target_computername, domain, user, password=str(),
                                  lmhash=str(), nthash=str()):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_localdisks()
+	return requester.get_localdisks()
 
 def get_netdomain(domain_controller, domain, user, password=str(),
                                  lmhash=str(), nthash=str()):
-    requester = NetRequester(domain_controller, domain, user, password,
+	requester = NetRequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netdomain()
+	return requester.get_netdomain()
 
 def get_netloggedon(target_computername, domain, user, password=str(),
                                  lmhash=str(), nthash=str()):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netloggedon()
+	return requester.get_netloggedon()
 
 def get_netlocalgroup(target_computername, domain_controller, domain, user,
                       password=str(), lmhash=str(), nthash=str(), queried_groupname=str(),
                       list_groups=False, recurse=False):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash, domain_controller)
-    return requester.get_netlocalgroup(queried_groupname=queried_groupname,
+	return requester.get_netlocalgroup(queried_groupname=queried_groupname,
                                            list_groups=list_groups, recurse=recurse)
 
 def get_netprocess(target_computername, domain, user, password=str(),
                    lmhash=str(), nthash=str()):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netprocess()
+	return requester.get_netprocess()
 
 def get_userevent(target_computername, domain, user, password=str(),
                    lmhash=str(), nthash=str(), event_type=['logon', 'tgt'],
                    date_start=5):
-    requester = NetRequester(target_computername, domain, user, password,
+	requester = NetRequester(target_computername, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_userevent(event_type=event_type,
+	return requester.get_userevent(event_type=event_type,
                                        date_start=date_start)
 
 def get_netgpo(domain_controller, domain, user, password=str(),
                lmhash=str(), nthash=str(), queried_gponame='*',
                queried_displayname=str(), queried_domain=str(), ads_path=str()):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.get_netgpo(queried_gponame=queried_gponame,
+        return requester.get_netgpo(queried_gponame=queried_gponame,
                                     queried_displayname=queried_displayname,
                                     queried_domain=queried_domain, ads_path=ads_path)
 
 def get_domainpolicy(domain_controller, domain, user, password=str(),
                      lmhash=str(), nthash=str(), source='domain', queried_domain=str(),
                      resolve_sids=False):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
 
-    return requester.get_domainpolicy(source=source, queried_domain=queried_domain,
+        return requester.get_domainpolicy(source=source, queried_domain=queried_domain,
                                           resolve_sids=resolve_sids)
 
 def get_gpttmpl(gpttmpl_path, domain_controller, domain, user, password=str(), lmhash=str(),
                 nthash=str()):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
 
-    return requester.get_gpttmpl(gpttmpl_path)
+        return requester.get_gpttmpl(gpttmpl_path)
 
 def get_netgpogroup(domain_controller, domain, user, password=str(), lmhash=str(),
                     nthash=str(), queried_gponame='*', queried_displayname=str(),
                     queried_domain=str(), ads_path=str(), resolve_sids=False):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
 
-    return requester.get_netgpogroup(queried_gponame=queried_gponame,
+        return requester.get_netgpogroup(queried_gponame=queried_gponame,
                                          queried_displayname=queried_displayname,
                                          queried_domain=queried_domain,
                                          ads_path=ads_path,
@@ -226,10 +220,10 @@ def find_gpocomputeradmin(domain_controller, domain, user, password=str(), lmhas
                           nthash=str(), queried_computername=str(),
                           queried_ouname=str(), queried_domain=str(),
                           recurse=False):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
 
-    return requester.find_gpocomputeradmin(queried_computername=queried_computername,
+        return requester.find_gpocomputeradmin(queried_computername=queried_computername,
                                                queried_ouname=queried_ouname,
                                                queried_domain=queried_domain,
                                                recurse=recurse)
@@ -237,9 +231,10 @@ def find_gpocomputeradmin(domain_controller, domain, user, password=str(), lmhas
 def find_gpolocation(domain_controller, domain, user, password=str(), lmhash=str(),
                      nthash=str(), queried_username=str(), queried_groupname=str(),
                      queried_localgroup=str(), queried_domain=str()):
-    requester = GPORequester(domain_controller, domain, user, password,
+	requester = GPORequester(domain_controller, domain, user, password,
                                  lmhash, nthash)
-    return requester.find_gpolocation(queried_username=queried_username,
+
+        return requester.find_gpolocation(queried_username=queried_username,
                                           queried_groupname=queried_groupname,
                                           queried_localgroup=queried_localgroup,
                                           queried_domain=queried_domain)
diff --git a/pywerview/cli/main.py b/pywerview/cli/main.py
index 0849b45..9d781eb 100644
--- a/pywerview/cli/main.py
+++ b/pywerview/cli/main.py
@@ -106,12 +106,8 @@ def main():
             help='Query only users with adminCount=1')
     get_netuser_parser.add_argument('--allow-delegation', action='store_true',
             help='Return user accounts that are not marked as \'sensitive and not allowed for delegation\'')
-    get_netuser_parser.add_argument('--preauth-notreq', action='store_true',
-            help='Search for users with the PREAUTH_NOT_REQUIRED account control')
     get_netuser_parser.add_argument('--spn', action='store_true',
             help='Query only users with not-null Service Principal Names')
-    get_netuser_parser.add_argument('--custom-filter', dest='custom_filter',
-            default=str(), help='Custom filter')
     get_netuser_parser.set_defaults(func=get_netuser)
 
     # Parser for the get-netgroup command
@@ -228,13 +224,6 @@ def main():
             help='If set, returns full information on the subnets, otherwise, just the name')
     get_netsubnet_parser.set_defaults(func=get_netsubnet)
 
-    # Parser for the get-netdomaintrust command
-    get_netdomaintrust_parser = subparsers.add_parser('get-netdomaintrust', help='Returns a list of all the '\
-        'trusts of the specified domain', parents=[ad_parser])
-    get_netdomaintrust_parser.add_argument('-d', '--domain', dest='queried_domain',
-            help='Domain to query')
-    get_netdomaintrust_parser.set_defaults(func=get_netdomaintrust)
-
     # Parser for the get-netgpo command
     get_netgpo_parser = subparsers.add_parser('get-netgpo', help='Get a list of all current '\
         'GPOs in the domain', parents=[ad_parser])
@@ -435,8 +424,6 @@ def main():
     invoke_eventhunter_parser.set_defaults(func=invoke_eventhunter)
 
     args = parser.parse_args()
-    if hasattr(args,'queried_groupname'):
-        args.queried_groupname = args.queried_groupname.encode('utf-8').decode('latin1')
     if args.hashes:
         try:
             args.lmhash, args.nthash = args.hashes.split(':')
@@ -452,7 +439,7 @@ def main():
         args.password = getpass('Password:')
 
     parsed_args = dict()
-    for k, v in vars(args).items():
+    for k, v in vars(args).iteritems():
         if k not in ('func', 'hashes'):
             parsed_args[k] = v
 
@@ -462,13 +449,12 @@ def main():
         #print >>sys.stderr, repr(e)
         #sys.exit(-1)
 
-    if results is not None:
-        try:
-            for x in results:
-                x = str(x).encode('latin1').decode('utf-8')
-                print(x)
-                if '\n' in x:
-                    print('')
-        except TypeError:
-            print(results)
+    try:
+        for x in results:
+            x = str(x)
+            print x
+            if '\n' in x:
+                print ''
+    except TypeError:
+        print results
 
diff --git a/pywerview/functions/gpo.py b/pywerview/functions/gpo.py
index f9baba0..0ef87fa 100644
--- a/pywerview/functions/gpo.py
+++ b/pywerview/functions/gpo.py
@@ -19,7 +19,7 @@
 
 import codecs
 from bs4 import BeautifulSoup
-from io import BytesIO
+from StringIO import StringIO
 
 from impacket.smbconnection import SMBConnection, SessionError
 
@@ -45,10 +45,10 @@ class GPORequester(LDAPRequester):
         return self._ldap_search(gpo_search_filter, GPO)
 
     def get_gpttmpl(self, gpttmpl_path):
-        content_io = BytesIO()
+        content_io = StringIO()
 
         gpttmpl_path_split = gpttmpl_path.split('\\')
-        target = self._domain_controller
+        target = gpttmpl_path_split[2]
         share = gpttmpl_path_split[3]
         file_name = '\\'.join(gpttmpl_path_split[4:])
 
@@ -59,10 +59,11 @@ class GPORequester(LDAPRequester):
 
         smb_connection.connectTree(share)
         smb_connection.getFile(share, file_name, content_io.write)
+
         try:
-            content = codecs.decode(content_io.getvalue(), 'utf-16le')[1:].replace('\r', '')
+            content = codecs.decode(content_io.getvalue(), 'utf_16_le')[1:].replace('\r', '')
         except UnicodeDecodeError:
-            content = str(content_io.getvalue()).replace('\r', '')
+            content = content_io.getvalue().replace('\r', '')
 
         gpttmpl_final = GptTmpl(list())
         for l in content.split('\n'):
@@ -112,10 +113,8 @@ class GPORequester(LDAPRequester):
                             sids = member[1]
                         resolved_sids = list()
                         for sid in sids:
-                            if not sid:
-                                continue
                             try:
-                                resolved_sid = net_requester.get_adobject(queried_sid=sid, queried_domain=queried_domain)[0]
+                                resolved_sid = net_requester.get_adobject(queried_sid=sid)[0]
                             except IndexError:
                                 resolved_sid = sid
                             else:
@@ -138,7 +137,7 @@ class GPORequester(LDAPRequester):
 
         groupsxml_path_split = groupsxml_path.split('\\')
         gpo_name = groupsxml_path_split[6]
-        target = self._domain_controller
+        target = groupsxml_path_split[2]
         share = groupsxml_path_split[3]
         file_name = '\\'.join(groupsxml_path_split[4:])
 
@@ -270,7 +269,7 @@ class GPORequester(LDAPRequester):
                                   self._password, self._lmhash, self._nthash) as net_requester:
                     for member in members:
                         try:
-                            resolved_member = net_requester.get_adobject(queried_sid=member, queried_domain=queried_domain)[0]
+                            resolved_member = net_requester.get_adobject(queried_sid=member)[0]
                             resolved_member = resolved_member.distinguishedname.split(',')
                             resolved_member_domain = '.'.join(resolved_member[1:])
                             resolved_member = '{}\\{}'.format(resolved_member_domain, resolved_member[0])
@@ -283,7 +282,7 @@ class GPORequester(LDAPRequester):
 
                     for member in memberof:
                         try:
-                            resolved_member = net_requester.get_adobject(queried_sid=member, queried_domain=queried_domain)[0]
+                            resolved_member = net_requester.get_adobject(queried_sid=member)[0]
                             resolved_member = resolved_member.distinguishedname.split(',')[:2]
                             resolved_member = '{}\\{}'.format(resolved_member[1], resolved_member[0])
                             resolved_member = resolved_member.replace('CN=', '').replace('DC=', '')
@@ -352,7 +351,6 @@ class GPORequester(LDAPRequester):
                                 while groups_to_resolve:
                                     group_to_resolve = groups_to_resolve.pop(0)
                                     group_members = net_requester.get_netgroupmember(queried_sid=group_to_resolve,
-                                                                                     queried_domain=queried_domain,
                                                                                      full_data=True)
                                     for group_member in group_members:
                                         gpo_computer_admin = GPOComputerAdmin(list())
@@ -414,30 +412,19 @@ class GPORequester(LDAPRequester):
         object_groups = net_requester.get_netgroup(queried_username=object_sam_account_name,
                                                    queried_domain=queried_domain)
         for object_group in object_groups:
-            try:
-                object_group_sid = net_requester.get_adobject(queried_sam_account_name=object_group.samaccountname,
-                                                              queried_domain=queried_domain)[0].objectsid
-            except IndexError:
-                # We may have the name of the group, but not its sam account name
-                try:
-                    object_group_sid = net_requester.get_adobject(queried_name=object_group.samaccountname,
-                                                                  queried_domain=queried_domain)[0].objectsid
-                except IndexError:
-                    # Freak accident when someone is a member of a group, but
-                    # we can't find the group in the AD
-                    continue
-
+            object_group_sid = net_requester.get_adobject(queried_sam_account_name=object_group.samaccountname,
+                                                          queried_domain=queried_domain)[0].objectsid
             target_sid.append(object_group_sid)
 
         gpo_groups = list()
-        for gpo_group in self.get_netgpogroup(queried_domain=queried_domain):
+        for gpo_group in self.get_netgpogroup():
             try:
                 for member in gpo_group.members:
                     if not member.upper().startswith('S-1-5'):
                         try:
                             member = net_requester.get_adobject(queried_sam_account_name=member,
                                                                 queried_domain=queried_domain)[0].objectsid
-                        except (IndexError, AttributeError):
+                        except IndexError, AttributeError:
                             continue
                     if (member.upper() in target_sid) or (member.lower() in target_sid):
                         if (local_sid.upper() in gpo_group.memberof) or \
diff --git a/pywerview/functions/hunting.py b/pywerview/functions/hunting.py
index 3fa1dc9..864984f 100644
--- a/pywerview/functions/hunting.py
+++ b/pywerview/functions/hunting.py
@@ -136,7 +136,7 @@ class Hunter(NetRequester):
             raise ValueError('No users to search for')
 
     def _build_workers(self, threads, worker_class, worker_args):
-        for i in range(threads):
+        for i in xrange(threads):
             parent_pipe, worker_pipe = multiprocessing.Pipe()
             self._parent_pipes.append(parent_pipe)
             worker = worker_class(worker_pipe, self._domain, self._user,
diff --git a/pywerview/functions/net.py b/pywerview/functions/net.py
index b7d82e1..50394e4 100644
--- a/pywerview/functions/net.py
+++ b/pywerview/functions/net.py
@@ -49,7 +49,6 @@ class NetRequester(LDAPRPCRequester):
     def get_netuser(self, queried_username=str(), queried_domain=str(),
                     ads_path=str(), admin_count=False, spn=False,
                     unconstrained=False, allow_delegation=False,
-                    preauth_notreq=False,
                     custom_filter=str()):
 
         if unconstrained:
@@ -60,14 +59,12 @@ class NetRequester(LDAPRPCRequester):
 
         if admin_count:
             custom_filter += '(admincount=1)'
-        # LDAP filter from https://www.harmj0y.net/blog/activedirectory/roasting-as-reps/
-        if preauth_notreq:
-            custom_filter += '(userAccountControl:1.2.840.113556.1.4.803:=4194304)'
+
         user_search_filter = '(samAccountType=805306368){}'.format(custom_filter)
         if queried_username:
             user_search_filter += '(samAccountName={})'.format(queried_username)
         elif spn:
-            user_search_filter += '(servicePrincipalName=*)'
+            user_search_filter += '(servicePrincipalName={})'.format(spn)
 
         user_search_filter = '(&{})'.format(user_search_filter)
 
@@ -83,6 +80,7 @@ class NetRequester(LDAPRPCRequester):
             results = list()
             sam_account_name_to_resolve = [queried_username]
             first_run = True
+            sam_account_name_already_resolved = list()
             while sam_account_name_to_resolve:
                 sam_account_name = sam_account_name_to_resolve.pop(0)
                 if first_run:
@@ -92,14 +90,9 @@ class NetRequester(LDAPRPCRequester):
                     objects = self.get_adobject(queried_sam_account_name=sam_account_name,
                                                 queried_domain=queried_domain,
                                                 ads_path=ads_path, custom_filter=custom_filter)
-                    objects += self.get_adobject(queried_name=sam_account_name,
-                                                 queried_domain=queried_domain,
-                                                 ads_path=ads_path, custom_filter=custom_filter)
                 else:
                     objects = self.get_adobject(queried_sam_account_name=sam_account_name,
                                                 queried_domain=queried_domain)
-                    objects += self.get_adobject(queried_name=sam_account_name,
-                                                 queried_domain=queried_domain)
 
                 for obj in objects:
                     try:
@@ -183,7 +176,7 @@ class NetRequester(LDAPRPCRequester):
             if len(split_path) >= 3:
                 return split_path[2]
 
-        results = set()
+        results = list()
         if target_users:
             users = list()
             for target_user in target_users:
@@ -192,20 +185,14 @@ class NetRequester(LDAPRPCRequester):
             users = self.get_netuser(queried_domain=queried_domain)
 
         for user in users:
-            for full_path in (user.homedirectory, user.scriptpath, user.profilepath):
-                if not full_path:
-                    continue
-                path = split_path(full_path)
-                if path:
-                    results.add(path)
-
-        final_results = list()
-        for file_server_name in results:
-            attributes = list()
-            attributes.append({'type': 'dnshostname', 'vals': [file_server_name]})
-            final_results.append(adobj.FileServer(attributes))
+            if user.homedirectory:
+                results.append(split_path(user.homedirectory))
+            if user.scriptpath:
+                results.append(split_path(user.scriptpath))
+            if user.profilepath:
+                results.append(split_path(user.profilepath))
 
-        return final_results
+        return results
 
     @LDAPRPCRequester._ldap_connection_init
     def get_dfsshare(self, version=['v1', 'v2'], queried_domain=str(), ads_path=str()):
@@ -331,9 +318,7 @@ class NetRequester(LDAPRPCRequester):
         def _get_members(_groupname=str(), _sid=str()):
             try:
                 if _groupname:
-                    groups = self.get_netgroup(queried_groupname=_groupname,
-                                               queried_domain=queried_domain,
-                                               full_data=True)
+                    groups = self.get_netgroup(queried_groupname=_groupname, full_data=True)
                 else:
                     if _sid:
                         queried_sid = _sid
@@ -343,9 +328,7 @@ class NetRequester(LDAPRPCRequester):
                                                            self._password, self._lmhash,
                                                            self._nthash) as misc_requester:
                             queried_sid = misc_requester.get_domainsid(queried_domain) + '-512'
-                    groups = self.get_netgroup(queried_sid=queried_sid,
-                                               queried_domain=queried_domain,
-                                               full_data=True)
+                    groups = self.get_netgroup(queried_sid=queried_sid, full_data=True)
             except IndexError:
                 raise ValueError('The group {} was not found'.format(_groupname))
 
@@ -356,15 +339,14 @@ class NetRequester(LDAPRPCRequester):
                 if recurse and use_matching_rule:
                     group_memberof_filter = '(&(samAccountType=805306368)(memberof:1.2.840.113556.1.4.1941:={}){})'.format(group.distinguishedname, custom_filter)
 
-                    members = self.get_netuser(custom_filter=group_memberof_filter,
-                                               queried_domain=queried_domain)
+                    members = self.get_netuser(custom_filter=group_memberof_filter)
                 else:
                     # TODO: range cycling
                     try:
                         for member in group.member:
                             dn_filter = '(distinguishedname={}){}'.format(member, custom_filter)
-                            members += self.get_netuser(custom_filter=dn_filter, queried_domain=queried_domain)
-                            members += self.get_netgroup(custom_filter=dn_filter, queried_domain=queried_domain, full_data=True)
+                            members += self.get_netuser(custom_filter=dn_filter)
+                            members += self.get_netgroup(custom_filter=dn_filter, full_data=True)
                     # The group doesn't have any members
                     except AttributeError:
                         continue
@@ -414,12 +396,6 @@ class NetRequester(LDAPRPCRequester):
 
         return results
 
-    @LDAPRPCRequester._ldap_connection_init
-    def get_netdomaintrust(self, queried_domain):
-        trust_search_filter = '(&(objectClass=trustedDomain))'
-
-        return self._ldap_search(trust_search_filter, adobj.Trust)
-
     @LDAPRPCRequester._rpc_connection_init(r'\srvsvc')
     def get_netsession(self):
 
@@ -605,38 +581,33 @@ class NetRequester(LDAPRPCRequester):
                 # It's a domain member
                 else:
                     attributes['isdomain'] = True
-                    if self._ldap_connection is not None:
+                    try:
+                        ad_object = self.get_adobject(queried_sid=member_sid)[0]
+                        member_dn = ad_object.distinguishedname
+                        member_domain = member_dn[member_dn.index('DC='):].replace('DC=', '').replace(',', '.')
                         try:
-                            ad_object = self.get_adobject(queried_sid=member_sid)[0]
-                            member_dn = ad_object.distinguishedname
-                            member_domain = member_dn[member_dn.index('DC='):].replace('DC=', '').replace(',', '.')
-                            try:
-                                attributes['name'] = '{}/{}'.format(member_domain, ad_object.samaccountname)
-                            except AttributeError:
-                                # Here, the member is a foreign security principal
-                                # TODO: resolve it properly
-                                attributes['name'] = '{}/{}'.format(member_domain, ad_object.objectsid)
-                            attributes['isgroup'] = ad_object.isgroup
-                            try:
-                                attributes['lastlogin'] = ad_object.lastlogon
-                            except AttributeError:
-                                attributes['lastlogin'] = str()
-                        except IndexError:
-                            # We did not manage to resolve this SID against the DC
-                            attributes['isdomain'] = False
-                            attributes['isgroup'] = False
-                            attributes['name'] = attributes['sid']
+                            attributes['name'] = '{}/{}'.format(member_domain, ad_object.samaccountname)
+                        except AttributeError:
+                            # Here, the member is a foreign security principal
+                            # TODO: resolve it properly
+                            attributes['name'] = '{}/{}'.format(member_domain, ad_object.objectsid)
+                        attributes['isgroup'] = ad_object.isgroup
+                        try:
+                            attributes['lastlogin'] = ad_object.lastlogon
+                        except AttributeError:
                             attributes['lastlogin'] = str()
-                    else:
+                    except IndexError:
+                        # We did not manage to resolve this SID against the DC
+                        attributes['isdomain'] = False
                         attributes['isgroup'] = False
-                        attributes['name'] = str()
+                        attributes['name'] = attributes['sid']
                         attributes['lastlogin'] = str()
 
                 results.append(rpcobj.RPCObject(attributes))
 
                 # If we recurse and the member is a domain group, we query every member
                 # TODO: implement check on self._domain_controller here?
-                if self._ldap_connection and self._domain_controller and recurse and attributes['isdomain'] and attributes['isgroup']:
+                if self._domain_controller and recurse and attributes['isdomain'] and attributes['isgroup']:
                     for domain_member in self.get_netgroupmember(full_data=True, recurse=True, queried_sid=attributes['sid']):
                         domain_member_attributes = dict()
                         domain_member_attributes['isdomain'] = True
@@ -672,7 +643,7 @@ class NetRequester(LDAPRPCRequester):
 
                 result_process = rpcobj.Process(attributes)
                 yield result_process
-            except Exception as e:
+            except Exception, e:
                 if str(e).find('S_FALSE') < 0:
                     raise e
                 else:
@@ -721,7 +692,7 @@ class NetRequester(LDAPRPCRequester):
                               'id': wmi_event_type}
                 result_event = rpcobj.Event(attributes)
                 yield result_event
-            except Exception as e:
+            except Exception, e:
                 if str(e).find('S_FALSE') < 0:
                     raise e
                 else:
diff --git a/pywerview/objects/adobjects.py b/pywerview/objects/adobjects.py
index 385117c..66ce76e 100644
--- a/pywerview/objects/adobjects.py
+++ b/pywerview/objects/adobjects.py
@@ -20,33 +20,8 @@
 from datetime import datetime
 import inspect
 import struct
-import pyasn1
-import codecs
 
 class ADObject:
-    __uac_flags = {0x0000001: 'SCRIPT',
-                   0x0000002: 'ACCOUNTDISABLE',
-                   0x0000008: 'HOMEDIR_REQUIRED',
-                   0x0000010: 'LOCKOUT',
-                   0x0000020: 'PASSWD_NOTREQD',
-                   0x0000040: 'PASSWD_CANT_CHANGE',
-                   0x0000080: 'ENCRYPTED_TEXT_PWD_ALLOWED',
-                   0x0000100: 'TEMP_DUPLICATE_ACCOUNT',
-                   0x0000200: 'NORMAL_ACCOUNT',
-                   0x0000800: 'INTERDOMAIN_TRUST_ACCOUNT',
-                   0x0001000: 'WORKSTATION_TRUST_ACCOUNT',
-                   0x0002000: 'SERVER_TRUST_ACCOUNT',
-                   0x0010000: 'DONT_EXPIRE_PASSWORD',
-                   0x0020000: 'MNS_LOGON_ACCOUNT',
-                   0x0040000: 'SMARTCARD_REQUIRED',
-                   0x0080000: 'TRUSTED_FOR_DELEGATION',
-                   0x0100000: 'NOT_DELEGATED',
-                   0x0200000: 'USE_DES_KEY_ONLY',
-                   0x0400000: 'DONT_REQ_PREAUTH',
-                   0x0800000: 'PASSWORD_EXPIRED',
-                   0x1000000: 'TRUSTED_TO_AUTH_FOR_DELEGATION',
-                   0x4000000: 'PARTIAL_SECRETS_ACCOUNT'}
-
     def __init__(self, attributes):
         self.add_attributes(attributes)
 
@@ -56,22 +31,20 @@ class ADObject:
             if t in ('logonhours', 'msds-generationid'):
                 value = str(attr['vals'][0])
                 value = [ord(x) for x in value]
-            elif t in ('trustattributes', 'trustdirection', 'trusttype'):
-                value = int(attr['vals'][0])
             elif t in ('objectsid', 'ms-ds-creatorsid'):
-                value = codecs.encode(bytes(attr['vals'][0]),'hex')
-                init_value = bytes(attr['vals'][0])
+                value = str(attr['vals'][0]).encode('hex')
+                init_value = str(attr['vals'][0])
                 value = 'S-1-5'
-                for i in range(8, len(init_value), 4):
+                for i in xrange(8, len(init_value), 4):
                     value += '-{}'.format(str(struct.unpack('<I', init_value[i:i+4])[0]))
             elif t == 'objectguid':
-                init_value = bytes(attr['vals'][0])
+                init_value = str(attr['vals'][0])
                 value = str()
                 value += '{}-'.format(hex(struct.unpack('<I', init_value[0:4])[0])[2:].zfill(8))
                 value += '{}-'.format(hex(struct.unpack('<H', init_value[4:6])[0])[2:].zfill(4))
                 value += '{}-'.format(hex(struct.unpack('<H', init_value[6:8])[0])[2:].zfill(4))
-                value += '{}-'.format(codecs.encode(init_value,'hex')[16:20])
-                value += init_value.hex()[20:]
+                value += '{}-'.format(init_value.encode('hex')[16:20])
+                value += init_value.encode('hex')[20:]
             elif t in ('dscorepropagationdata', 'whenchanged', 'whencreated'):
                 value = list()
                 for val in attr['vals']:
@@ -89,7 +62,7 @@ class ADObject:
             else:
                 try:
                     value = str(attr['vals'][0])
-                except (IndexError, pyasn1.error.PyAsn1Error):
+                except IndexError:
                     value = str()
 
             setattr(self, t, value)
@@ -105,28 +78,20 @@ class ADObject:
         for member in members:
             if not member[0].startswith('_'):
                 if member[0] == 'msmqdigests':
-                    member_value = (',\n' + ' ' * (max_length + 2)).join(x.encode('utf-8').hex() for x in member[1])
-                elif member[0] == 'useraccountcontrol':
-                    member_value = list()
-                    for uac_flag, uac_label in ADObject.__uac_flags.items():
-                        if int(member[1]) & uac_flag == uac_flag:
-                            member_value.append(uac_label)
+                    member_value = (',\n' + ' ' * (max_length + 2)).join(x.encode('hex') for x in member[1])
                 elif isinstance(member[1], list):
                     if member[0] in ('logonhours',):
                         member_value = member[1]
-                    elif member[0] in ('usercertificate',
-                                       'protocom-sso-entries', 'protocom-sso-security-prefs',):
+                    elif member[0] in ('usercertificate',):
                         member_value = (',\n' + ' ' * (max_length + 2)).join(
-                                '{}...'.format(x.encode('utf-8').hex()[:100]) for x in member[1])
+                                '{}...'.format(x.encode('hex')[:100]) for x in member[1])
                     else:
                         member_value = (',\n' + ' ' * (max_length + 2)).join(str(x) for x in member[1])
                 elif member[0] in('msmqsigncertificates', 'userparameters',
                                   'jpegphoto', 'thumbnailphoto', 'usercertificate',
                                   'msexchmailboxguid', 'msexchmailboxsecuritydescriptor',
-                                  'msrtcsip-userroutinggroupid', 'msexchumpinchecksum',
-                                  'protocom-sso-auth-data', 'protocom-sso-entries-checksum',
-                                  'protocom-sso-security-prefs-checksum', ):
-                    member_value = '{}...'.format(member[1].encode('utf-8').hex()[:100])
+                                  'msrtcsip-userroutinggroupid', 'msexchumpinchecksum'):
+                    member_value = '{}...'.format(member[1].encode('hex')[:100])
                 else:
                     member_value = member[1]
                 s += '{}: {}{}\n'.format(member[0], ' ' * (max_length - len(member[0])), member_value)
@@ -156,9 +121,6 @@ class Group(ADObject):
 class Computer(ADObject):
     pass
 
-class FileServer(ADObject):
-    pass
-
 class DFS(ADObject):
     pass
 
@@ -173,36 +135,6 @@ class Site(ADObject):
 class Subnet(ADObject):
     pass
 
-class Trust(ADObject):
-    __trust_attrib = {0x1: 'non_transitive', 0x2: 'uplevel_only',
-                      0x4: 'filter_sids', 0x8: 'forest_transitive',
-                      0x10: 'cross_organization', 0x20: 'within_forest',
-                      0x40: 'treat_as_external',
-                      0x80: 'trust_uses_rc4_encryption',
-                      0x100: 'trust_uses_aes_keys',
-                      0X200: 'cross_organization_no_tgt_delegation',
-                      0x400: 'pim_trust'}
-
-    __trust_direction = {0: 'disabled', 1: 'inbound',
-                         2: 'outbound', 3: 'bidirectional'}
-
-    __trust_type = {1: 'windows_non_active_directory',
-                    2: 'windows_active_directory', 3: 'mit'}
-
-    def __init__(self, attributes):
-        ad_obj = ADObject(attributes)
-        self.targetname = ad_obj.name
-
-        self.trustattributes = list()
-        for attrib_flag, attrib_label in Trust.__trust_attrib.items():
-            if ad_obj.trustattributes & attrib_flag:
-                self.trustattributes.append(attrib_label)
-
-        self.trustdirection = Trust.__trust_direction.get(ad_obj.trustdirection, 'unknown')
-        self.trusttype = Trust.__trust_type.get(ad_obj.trusttype, 'unknown')
-        self.whencreated = ad_obj.whencreated
-        self.whenchanged = ad_obj.whenchanged
-
 class GPO(ADObject):
     pass
 
diff --git a/pywerview/objects/rpcobjects.py b/pywerview/objects/rpcobjects.py
index 482fa27..ebe64ca 100644
--- a/pywerview/objects/rpcobjects.py
+++ b/pywerview/objects/rpcobjects.py
@@ -40,7 +40,7 @@ class RPCObject:
                 value = value.rstrip('\x00')
             if isinstance(value, str):
                 try:
-                    value = value
+                    value = value.decode('utf-8')
                 except UnicodeDecodeError:
                     pass
 
diff --git a/pywerview/requester.py b/pywerview/requester.py
index 802dd86..b6bc61a 100644
--- a/pywerview/requester.py
+++ b/pywerview/requester.py
@@ -18,7 +18,7 @@
 # Yannick Méheut [yannick (at) meheut (dot) org] - Copyright © 2016
 
 import socket
-import ntpath
+
 from impacket.ldap import ldap, ldapasn1
 from impacket.smbconnection import SMBConnection
 from impacket.dcerpc.v5.rpcrt import RPC_C_AUTHN_LEVEL_PKT_PRIVACY
@@ -26,7 +26,6 @@ from impacket.dcerpc.v5 import transport, wkst, srvs, samr, scmr, drsuapi, epm
 from impacket.dcerpc.v5.dcom import wmi
 from impacket.dcerpc.v5.dtypes import NULL
 from impacket.dcerpc.v5.dcomrt import DCOMConnection
-from impacket.dcerpc.v5.rpcrt import DCERPCException
 
 class LDAPRequester():
     def __init__(self, domain_controller, domain=str(), user=(), password=str(),
@@ -43,13 +42,8 @@ class LDAPRequester():
         self._ldap_connection = None
 
     def _get_netfqdn(self):
-        try:
-            smb = SMBConnection(self._domain_controller, self._domain_controller)
-        except socket.error:
-            return str()
-
-        smb.login(self._user, self._password, domain=self._domain,
-                lmhash=self._lmhash, nthash=self._nthash)
+        smb = SMBConnection(self._domain_controller, self._domain_controller)
+        smb.login('', '')
         fqdn = smb.getServerDNSDomainName()
         smb.logoff()
 
@@ -61,7 +55,7 @@ class LDAPRequester():
             self._domain = self._get_netfqdn()
 
         if not queried_domain:
-            queried_domain = self._get_netfqdn()
+            queried_domain = self._domain
         self._queried_domain = queried_domain
 
         base_dn = str()
@@ -82,19 +76,16 @@ class LDAPRequester():
         try:
             ldap_connection = ldap.LDAPConnection('ldap://{}'.format(self._domain_controller),
                                                   base_dn, self._domain_controller)
-            ldap_connection.login(self._user, self._password, self._domain,
-                                  self._lmhash, self._nthash)
-        except ldap.LDAPSessionError as e:
+        except ldap.LDAPSessionError, e:
             if str(e).find('strongerAuthRequired') >= 0:
                 # We need to try SSL
                 ldap_connection = ldap.LDAPConnection('ldaps://{}'.format(self._domain_controller),
                                                       base_dn, self._domain_controller)
-                ldap_connection.login(self._user, self._password, self._domain,
-                                      self._lmhash, self._nthash)
             else:
                 raise e
-        except socket.error as e:
-            return
+
+        ldap_connection.login(self._user, self._password, self._domain,
+                              self._lmhash, self._nthash)
 
         self._ldap_connection = ldap_connection
 
@@ -198,26 +189,19 @@ class RPCRequester():
         if self._pipe == r'\drsuapi':
             dce.set_auth_level(RPC_C_AUTHN_LEVEL_PKT_PRIVACY)
 
-        try:
-            dce.connect()
-        except socket.error:
-            self._rpc_connection = None
-        else:
-            dce.bind(binding_strings[self._pipe[1:]])
-            self._rpc_connection = dce
+        dce.connect()
+        dce.bind(binding_strings[self._pipe[1:]])
 
-    def _create_wmi_connection(self, namespace='root\\cimv2'):
-        try:
-            self._dcom = DCOMConnection(self._target_computer, self._user, self._password,
-                                        self._domain, self._lmhash, self._nthash)
-        except DCERPCException:
-            self._dcom = None
-        else:
-            i_interface = self._dcom.CoCreateInstanceEx(wmi.CLSID_WbemLevel1Login,
-                                                        wmi.IID_IWbemLevel1Login)
-            i_wbem_level1_login = wmi.IWbemLevel1Login(i_interface)
-            self._wmi_connection = i_wbem_level1_login.NTLMLogin(ntpath.join('\\\\{}\\'.format(self._target_computer), namespace),
-                                                                 NULL, NULL)
+        self._rpc_connection = dce
+
+    def _create_wmi_connection(self):
+        self._dcom = DCOMConnection(self._target_computer, self._user, self._password,
+                                    self._domain, self._lmhash, self._nthash)
+        i_interface = self._dcom.CoCreateInstanceEx(wmi.CLSID_WbemLevel1Login,
+                                                    wmi.IID_IWbemLevel1Login)
+        i_wbem_level1_login = wmi.IWbemLevel1Login(i_interface)
+        self._wmi_connection = i_wbem_level1_login.NTLMLogin('\\\\{}\\root\\cimv2'.format(self._target_computer),
+                                                             NULL, NULL)
 
     @staticmethod
     def _rpc_connection_init(pipe=r'\srvsvc'):
@@ -228,8 +212,6 @@ class RPCRequester():
                     if instance._rpc_connection:
                         instance._rpc_connection.disconnect()
                     instance._create_rpc_connection(pipe=pipe)
-                if instance._rpc_connection is None:
-                    return None
                 return f(*args, **kwargs)
             return wrapper
         return decorator
@@ -241,8 +223,6 @@ class RPCRequester():
                 instance = args[0]
                 if not instance._wmi_connection:
                     instance._create_wmi_connection()
-                if instance._dcom is None:
-                    return None
                 return f(*args, **kwargs)
             return wrapper
         return decorator
@@ -273,7 +253,7 @@ class LDAPRPCRequester(LDAPRequester, RPCRequester):
     def __enter__(self):
         try:
             LDAPRequester.__enter__(self)
-        except (socket.error, IndexError):
+        except socket.error, IndexError:
             pass
         # This should work every time
         RPCRequester.__enter__(self)